axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r442716 - in /webservices/axis2/trunk/java/modules: adb-codegen/src/org/apache/axis2/schema/template/ codegen/src/org/apache/axis2/wsdl/template/java/
Date Tue, 12 Sep 2006 21:38:41 GMT
Author: dims
Date: Tue Sep 12 14:38:40 2006
New Revision: 442716

URL: http://svn.apache.org/viewvc?view=rev&rev=442716
Log:
remove tabs from stylesheets

Modified:
    webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
    webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl

Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?view=diff&rev=442716&r1=442715&r2=442716
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl Tue Sep 12 14:38:40 2006
@@ -102,19 +102,19 @@
 
 
             <xsl:variable name="lenFacet"><xsl:value-of select="@lenFacet"/></xsl:variable>
-           	<xsl:variable name="maxLenFacet"><xsl:value-of select="@maxLenFacet"/></xsl:variable>
-           	<xsl:variable name="minLenFacet"><xsl:value-of select="@minLenFacet"/></xsl:variable>
-           	<xsl:variable name="maxExFacet"><xsl:value-of select="@maxExFacet"/></xsl:variable>
-           	<xsl:variable name="minExFacet"><xsl:value-of select="@minExFacet"/></xsl:variable>
-           	<xsl:variable name="maxInFacet"><xsl:value-of select="@maxInFacet"/></xsl:variable>
-           	<xsl:variable name="minInFacet"><xsl:value-of select="@minInFacet"/></xsl:variable>
-           	<xsl:variable name="patternFacet"><xsl:value-of select="@patternFacet"/></xsl:variable>
+               <xsl:variable name="maxLenFacet"><xsl:value-of select="@maxLenFacet"/></xsl:variable>
+               <xsl:variable name="minLenFacet"><xsl:value-of select="@minLenFacet"/></xsl:variable>
+               <xsl:variable name="maxExFacet"><xsl:value-of select="@maxExFacet"/></xsl:variable>
+               <xsl:variable name="minExFacet"><xsl:value-of select="@minExFacet"/></xsl:variable>
+               <xsl:variable name="maxInFacet"><xsl:value-of select="@maxInFacet"/></xsl:variable>
+               <xsl:variable name="minInFacet"><xsl:value-of select="@minInFacet"/></xsl:variable>
+               <xsl:variable name="patternFacet"><xsl:value-of select="@patternFacet"/></xsl:variable>
             <xsl:variable name="shortTypeNameUncapped"  select="@shorttypename"/>
             <xsl:variable name="shortTypeName"
                select="concat(translate( substring($shortTypeNameUncapped, 1, 1 ),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' ), substring($shortTypeNameUncapped, 2, string-length($shortTypeNameUncapped)))" />
 
 
-			<xsl:choose>
+            <xsl:choose>
             <xsl:when test="@removed">
 
            /**
@@ -135,14 +135,14 @@
            * @throws RuntimeException
            */
            public void set<xsl:value-of select="$javaName"/>(<xsl:value-of select="$propertyType"/> param){
-           	   throw new java.lang.RuntimeException();
+                  throw new java.lang.RuntimeException();
            }
 
            </xsl:when>
            <xsl:otherwise>
                <xsl:choose>
                   <xsl:when test="(@restricted) and (@occuranceChanged) and (not(@typeChanged))">
-               		 <xsl:variable name="basePropertyType"><xsl:value-of select="@arrayBaseType"/></xsl:variable>
+                        <xsl:variable name="basePropertyType"><xsl:value-of select="@arrayBaseType"/></xsl:variable>
 
 
                      <!-- generate the validator Method, this is specifiacally for validating the arrays-->
@@ -172,7 +172,7 @@
                      */
                      public void set<xsl:value-of select="$javaName"/>(<xsl:value-of select="$propertyType"/> param){
                      <!-- call the validator-->
-                  		  validate<xsl:value-of select="$javaName"/>(param);
+                            validate<xsl:value-of select="$javaName"/>(param);
 
                      <xsl:if test="$choice">
                           clearAllSettingTrackers();
@@ -201,19 +201,19 @@
                   </xsl:when>
                   <xsl:otherwise>
 
-            		/**
-            		* field for <xsl:value-of select="$javaName"/>
-            		<xsl:if test="@attribute">
-            		* This was an Attribute!</xsl:if>
-            		<xsl:if test="@array">
-            		* This was an Array!</xsl:if>
-            		<xsl:if test="@typeChanged">
-            		* Type of this field is a subtype of its original.</xsl:if>
-            		<xsl:if test="(@rewrite) and (@occuranceChanged)">
-            		* This field was an array in <xsl:value-of select="$restriction"/>.</xsl:if>
-            		*/
+                    /**
+                    * field for <xsl:value-of select="$javaName"/>
+                    <xsl:if test="@attribute">
+                    * This was an Attribute!</xsl:if>
+                    <xsl:if test="@array">
+                    * This was an Array!</xsl:if>
+                    <xsl:if test="@typeChanged">
+                    * Type of this field is a subtype of its original.</xsl:if>
+                    <xsl:if test="(@rewrite) and (@occuranceChanged)">
+                    * This field was an array in <xsl:value-of select="$restriction"/>.</xsl:if>
+                    */
 
-            		protected <xsl:value-of select="$propertyType"/><xsl:text> </xsl:text><xsl:value-of select="$varName" /> ;
+                    protected <xsl:value-of select="$propertyType"/><xsl:text> </xsl:text><xsl:value-of select="$varName" /> ;
                     <xsl:if test="enumFacet">
                     private static java.util.HashMap _table_ = new java.util.HashMap();
 
@@ -289,135 +289,135 @@
                     </xsl:if>
                     <xsl:if test="not(enumFacet)">
                     <!-- Generate a tracker only if the min occurs is zero, which means if the user does
-               		not bother to set that value, we do not send it -->
-           			<xsl:if test="$min=0 or $choice">
-           			/*  This tracker boolean wil be used to detect whether the user called the set method
-              		*   for this attribute. It will be used to determine whether to include this field
-               		*   in the serialized XML
-           			*/
-           			protected boolean <xsl:value-of select="$settingTracker"/> = false ;
-           			</xsl:if>
-
-           			/**
-           			* Auto generated getter method
-           			* @return <xsl:value-of select="$propertyType"/>
-           			*/
-           			public  <xsl:value-of select="$propertyType"/><xsl:text> </xsl:text>get<xsl:value-of select="$javaName"/>(){
-               			return <xsl:value-of select="$varName"/>;
-           			}
-
-           			<!-- When generating the setters, we have to cater differently for the array!-->
-            		<xsl:choose>
-               			<xsl:when test="@array">
-                   		<xsl:variable name="basePropertyType"><xsl:value-of select="@arrayBaseType"/></xsl:variable>
-
-
-                   		<!-- generate the validator Method, this is specifiacally for validating the arrays-->
-                  		/**
-                   		* validate the array for <xsl:value-of select="$javaName"/>
-                   		*/
-                  		protected void validate<xsl:value-of select="$javaName"/>(<xsl:value-of select="$propertyType"/> param){
-                     	<xsl:if test="not(@unbound)">
+                       not bother to set that value, we do not send it -->
+                       <xsl:if test="$min=0 or $choice">
+                       /*  This tracker boolean wil be used to detect whether the user called the set method
+                      *   for this attribute. It will be used to determine whether to include this field
+                       *   in the serialized XML
+                       */
+                       protected boolean <xsl:value-of select="$settingTracker"/> = false ;
+                       </xsl:if>
+
+                       /**
+                       * Auto generated getter method
+                       * @return <xsl:value-of select="$propertyType"/>
+                       */
+                       public  <xsl:value-of select="$propertyType"/><xsl:text> </xsl:text>get<xsl:value-of select="$javaName"/>(){
+                           return <xsl:value-of select="$varName"/>;
+                       }
+
+                       <!-- When generating the setters, we have to cater differently for the array!-->
+                    <xsl:choose>
+                           <xsl:when test="@array">
+                           <xsl:variable name="basePropertyType"><xsl:value-of select="@arrayBaseType"/></xsl:variable>
+
+
+                           <!-- generate the validator Method, this is specifiacally for validating the arrays-->
+                          /**
+                           * validate the array for <xsl:value-of select="$javaName"/>
+                           */
+                          protected void validate<xsl:value-of select="$javaName"/>(<xsl:value-of select="$propertyType"/> param){
+                         <xsl:if test="not(@unbound)">
                           if (param.length &gt; <xsl:value-of select="@maxOccurs"/>){
                             throw new java.lang.RuntimeException();
                           }
-                      	</xsl:if>
-                      	<xsl:if test="$min!=0">
+                          </xsl:if>
+                          <xsl:if test="$min!=0">
                           if (param.length &lt; <xsl:value-of select="$min"/>){
                             throw new java.lang.RuntimeException();
                           }
-                      	</xsl:if>
-                  		}
+                          </xsl:if>
+                          }
 
 
-                 		/**
-                  		* Auto generated setter method
-                  		* @param param <xsl:value-of select="$javaName"/>
-                  		*/
-                  		public void set<xsl:value-of select="$javaName"/>(<xsl:value-of select="$propertyType"/> param){
-                  		<!-- call the validator-->
-                   			validate<xsl:value-of select="$javaName"/>(param);
-
-                   		<xsl:if test="$choice">
-                       		clearAllSettingTrackers();
-                   		</xsl:if>
-                   		<xsl:if test="$min=0 or $choice">
-                       		<!-- the updating of setting tracker for null values should
-                            	 happen if the attribute is marked as nillable. Else
+                         /**
+                          * Auto generated setter method
+                          * @param param <xsl:value-of select="$javaName"/>
+                          */
+                          public void set<xsl:value-of select="$javaName"/>(<xsl:value-of select="$propertyType"/> param){
+                          <!-- call the validator-->
+                               validate<xsl:value-of select="$javaName"/>(param);
+
+                           <xsl:if test="$choice">
+                               clearAllSettingTrackers();
+                           </xsl:if>
+                           <xsl:if test="$min=0 or $choice">
+                               <!-- the updating of setting tracker for null values should
+                                 happen if the attribute is marked as nillable. Else
                                  the user can set a null value and it is never marked
                                  as set
-                       		-->
-                       		<xsl:choose>
-                          		<xsl:when test="not(@nillable) and not(@primitive)">
-                              	if (param !=null){
-                              	//update the setting tracker
-                              	<xsl:value-of select="$settingTracker"/> = true;
-                               	}
-                           		</xsl:when>
-                           		<xsl:otherwise>
-                               	//update the setting tracker
-                              	<xsl:value-of select="$settingTracker"/> = true;
-                           		</xsl:otherwise>
-                       		</xsl:choose>
-                   		</xsl:if>
-                  				this.<xsl:value-of select="$varName"/>=param;
-                  		}
-
-                   		<!--
-
-                       	we special case the 'array' scenario and generate a
-                       	convenience method for adding elements one by one to
-                       	the array. The current implementation is somewhat
-                       	inefficient but gets the job done.Since a primitive
-                       	cannot be treated as an object it has to be ignored!
-
-                 		-->
-                 		<xsl:if test="not(@primitive)">
-                 		/**
-                 		* Auto generated add method for the array for convenience
-                 		* @param param <xsl:value-of select="$basePropertyType"/>
-                 		*/
-                 		public void add<xsl:value-of select="$javaName"/>(<xsl:value-of select="$basePropertyType"/> param){
-                   			if (<xsl:value-of select="$varName"/> == null){
-                       		<xsl:value-of select="$varName"/> = new <xsl:value-of select="$propertyType"/>{};
-                   			}
-
-                    	<xsl:if test="$choice">
-                           	clearAllSettingTrackers();
-                    	</xsl:if>
-                    	<xsl:if test="$min=0 or $choice">
-                         	//update the setting tracker
-                        	<xsl:value-of select="$settingTracker"/> = true;
-                    	</xsl:if>
+                               -->
+                               <xsl:choose>
+                                  <xsl:when test="not(@nillable) and not(@primitive)">
+                                  if (param !=null){
+                                  //update the setting tracker
+                                  <xsl:value-of select="$settingTracker"/> = true;
+                                   }
+                                   </xsl:when>
+                                   <xsl:otherwise>
+                                   //update the setting tracker
+                                  <xsl:value-of select="$settingTracker"/> = true;
+                                   </xsl:otherwise>
+                               </xsl:choose>
+                           </xsl:if>
+                                  this.<xsl:value-of select="$varName"/>=param;
+                          }
 
-                   		java.util.List list =
+                           <!--
+
+                           we special case the 'array' scenario and generate a
+                           convenience method for adding elements one by one to
+                           the array. The current implementation is somewhat
+                           inefficient but gets the job done.Since a primitive
+                           cannot be treated as an object it has to be ignored!
+
+                         -->
+                         <xsl:if test="not(@primitive)">
+                         /**
+                         * Auto generated add method for the array for convenience
+                         * @param param <xsl:value-of select="$basePropertyType"/>
+                         */
+                         public void add<xsl:value-of select="$javaName"/>(<xsl:value-of select="$basePropertyType"/> param){
+                               if (<xsl:value-of select="$varName"/> == null){
+                               <xsl:value-of select="$varName"/> = new <xsl:value-of select="$propertyType"/>{};
+                               }
+
+                        <xsl:if test="$choice">
+                               clearAllSettingTrackers();
+                        </xsl:if>
+                        <xsl:if test="$min=0 or $choice">
+                             //update the setting tracker
+                            <xsl:value-of select="$settingTracker"/> = true;
+                        </xsl:if>
+
+                           java.util.List list =
                         org.apache.axis2.databinding.utils.ConverterUtil.toList(<xsl:value-of select="$varName"/>);
-                   		list.add(param);
-                   		this.<xsl:value-of select="$varName"/> =
-                     	(<xsl:value-of select="$propertyType"/>)list.toArray(
+                           list.add(param);
+                           this.<xsl:value-of select="$varName"/> =
+                         (<xsl:value-of select="$propertyType"/>)list.toArray(
                         new <xsl:value-of select="$basePropertyType"/>[list.size()]);
 
-                 		}
-                 		</xsl:if>
-                     	<!-- end of special casing for the array-->
-
-               			</xsl:when>
-                		<!-- Non array setter method-->
-                		<xsl:otherwise>
-                    	/**
-                   		* Auto generated setter method
-                   		* @param param <xsl:value-of select="$javaName"/>
-                   		*/
-                   		public void set<xsl:value-of select="$javaName"/>(<xsl:value-of select="$propertyType"/> param){
-                    	<xsl:if test="$choice">
-                        	clearAllSettingTrackers();
-                    	</xsl:if>
-                    	<xsl:if test="$min=0 or $choice">
-                    		//update the setting tracker
-                    	<xsl:value-of select="$settingTracker"/> = true;
-                    	</xsl:if>
+                         }
+                         </xsl:if>
+                         <!-- end of special casing for the array-->
+
+                           </xsl:when>
+                        <!-- Non array setter method-->
+                        <xsl:otherwise>
+                        /**
+                           * Auto generated setter method
+                           * @param param <xsl:value-of select="$javaName"/>
+                           */
+                           public void set<xsl:value-of select="$javaName"/>(<xsl:value-of select="$propertyType"/> param){
+                        <xsl:if test="$choice">
+                            clearAllSettingTrackers();
+                        </xsl:if>
+                        <xsl:if test="$min=0 or $choice">
+                            //update the setting tracker
+                        <xsl:value-of select="$settingTracker"/> = true;
+                        </xsl:if>
 
-                   		<xsl:choose>
+                           <xsl:choose>
                         <xsl:when test="(@restrictionBaseType)">
                            <xsl:choose>
                             <xsl:when test="(@patternFacet)">
@@ -459,20 +459,20 @@
                         </xsl:choose>
                         </xsl:when>
 
-						<xsl:otherwise>
-								this.<xsl:value-of select="$varName"/>=param;
-						</xsl:otherwise>
-						</xsl:choose>
-
-                   		}
-                		</xsl:otherwise>
-            		</xsl:choose>
+                        <xsl:otherwise>
+                                this.<xsl:value-of select="$varName"/>=param;
+                        </xsl:otherwise>
+                        </xsl:choose>
+
+                           }
+                        </xsl:otherwise>
+                    </xsl:choose>
                     </xsl:if>
 
                   </xsl:otherwise>
                </xsl:choose>
 
-			</xsl:otherwise>
+            </xsl:otherwise>
             </xsl:choose>
 
              <!-- end of xsl:if for not(@inherited) -->
@@ -504,7 +504,7 @@
             <xsl:when test="@type or @anon">
                 <!-- For a type write the passed in QName first-->
 
-		        java.lang.String prefix = parentQName.getPrefix();
+                java.lang.String prefix = parentQName.getPrefix();
                 java.lang.String namespace = parentQName.getNamespaceURI();
 
                 if (namespace != null) {
@@ -521,8 +521,8 @@
                         xmlWriter.setPrefix(prefix, namespace);
                     }
                 } else {
-		    xmlWriter.writeStartElement(parentQName.getLocalPart());
-		}
+            xmlWriter.writeStartElement(parentQName.getLocalPart());
+        }
 
                 <!-- write the type attribute if needed -->
                <xsl:if test="$extension">
@@ -544,25 +544,25 @@
                                                      xmlWriter);
                         </xsl:when>
                         <xsl:when test="@any and @array">
-							 if (<xsl:value-of select="$varName"/> != null) {
-								 for (int i=0;i &lt;<xsl:value-of select="$varName"/>.length;i++){
-									 writeAttribute(<xsl:value-of select="$varName"/>[i].getNamespace().getName(),
+                             if (<xsl:value-of select="$varName"/> != null) {
+                                 for (int i=0;i &lt;<xsl:value-of select="$varName"/>.length;i++){
+                                     writeAttribute(<xsl:value-of select="$varName"/>[i].getNamespace().getName(),
                                                     <xsl:value-of select="$varName"/>[i].getLocalName(),
                                                     <xsl:value-of select="$varName"/>[i].getAttributeValue(),xmlWriter);
-									 }
-							 }
+                                     }
+                             }
                         </xsl:when>
                         <!-- there can never be attribute arrays in the normal case-->
                         <xsl:when test="@optional">
- 							// optional attribute <xsl:value-of select="$propertyName"/>
- 							try {
-								writeAttribute("<xsl:value-of select="$namespace"/>",
+                             // optional attribute <xsl:value-of select="$propertyName"/>
+                             try {
+                                writeAttribute("<xsl:value-of select="$namespace"/>",
                                                "<xsl:value-of select="$propertyName"/>",
-                                               org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>), xmlWriter);							
-							} catch (NullPointerException e) {
-								// If <xsl:value-of select="$varName"/> was null
-								// it can not be serialized.
-							}
+                                               org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>), xmlWriter);                            
+                            } catch (NullPointerException e) {
+                                // If <xsl:value-of select="$varName"/> was null
+                                // it can not be serialized.
+                            }
                         </xsl:when>
                         <xsl:otherwise>
                              writeAttribute("<xsl:value-of select="$namespace"/>",
@@ -589,25 +589,25 @@
                                 <xsl:when test="@nillable">
                                     if (<xsl:value-of select="$varName"/>==null){
 
-				        java.lang.String namespace2 = "<xsl:value-of select="$namespace"/>";
+                        java.lang.String namespace2 = "<xsl:value-of select="$namespace"/>";
 
-					if (! namespace2.equals("")) {
-						java.lang.String prefix2 = xmlWriter.getPrefix(namespace2);
+                    if (! namespace2.equals("")) {
+                        java.lang.String prefix2 = xmlWriter.getPrefix(namespace2);
 
-						if (prefix2 == null) {
-							prefix2 = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                        if (prefix2 == null) {
+                            prefix2 = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
 
-							xmlWriter.writeStartElement(prefix2,"<xsl:value-of select="$propertyName"/>", namespace2);
-							xmlWriter.writeNamespace(prefix2, namespace2);
-							xmlWriter.setPrefix(prefix2, namespace2);
+                            xmlWriter.writeStartElement(prefix2,"<xsl:value-of select="$propertyName"/>", namespace2);
+                            xmlWriter.writeNamespace(prefix2, namespace2);
+                            xmlWriter.setPrefix(prefix2, namespace2);
 
-						} else {
-							xmlWriter.writeStartElement(namespace2,"<xsl:value-of select="$propertyName"/>");
-						}
+                        } else {
+                            xmlWriter.writeStartElement(namespace2,"<xsl:value-of select="$propertyName"/>");
+                        }
 
-					} else {
-						xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
-					}
+                    } else {
+                        xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
+                    }
 
 
                                        // write the nil attribute
@@ -710,25 +710,25 @@
                             </xsl:choose>
 
                             for (int i = 0;i &lt; <xsl:value-of select="$varName"/>.length;i++){
-                            	        namespace = "<xsl:value-of select="$namespace"/>";
+                                        namespace = "<xsl:value-of select="$namespace"/>";
 
-					if (! namespace.equals("")) {
-						prefix = xmlWriter.getPrefix(namespace);
+                    if (! namespace.equals("")) {
+                        prefix = xmlWriter.getPrefix(namespace);
 
-						if (prefix == null) {
-							prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                        if (prefix == null) {
+                            prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
 
-							xmlWriter.writeStartElement(prefix,"<xsl:value-of select="$propertyName"/>", namespace);
-							xmlWriter.writeNamespace(prefix, namespace);
-							xmlWriter.setPrefix(prefix, namespace);
+                            xmlWriter.writeStartElement(prefix,"<xsl:value-of select="$propertyName"/>", namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
 
-						} else {
-							xmlWriter.writeStartElement(namespace,"<xsl:value-of select="$propertyName"/>");
-						}
+                        } else {
+                            xmlWriter.writeStartElement(namespace,"<xsl:value-of select="$propertyName"/>");
+                        }
 
-					} else {
-						xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
-					}
+                    } else {
+                        xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
+                    }
 
 
 
@@ -764,25 +764,25 @@
                         </xsl:when>
                         <!-- handle all other cases -->
                          <xsl:otherwise>
-			 		namespace = "<xsl:value-of select="$namespace"/>";
+                     namespace = "<xsl:value-of select="$namespace"/>";
 
-					if (! namespace.equals("")) {
-						prefix = xmlWriter.getPrefix(namespace);
+                    if (! namespace.equals("")) {
+                        prefix = xmlWriter.getPrefix(namespace);
 
-						if (prefix == null) {
-							prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                        if (prefix == null) {
+                            prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
 
-							xmlWriter.writeStartElement(prefix,"<xsl:value-of select="$propertyName"/>", namespace);
-							xmlWriter.writeNamespace(prefix, namespace);
-							xmlWriter.setPrefix(prefix, namespace);
+                            xmlWriter.writeStartElement(prefix,"<xsl:value-of select="$propertyName"/>", namespace);
+                            xmlWriter.writeNamespace(prefix, namespace);
+                            xmlWriter.setPrefix(prefix, namespace);
 
-						} else {
-							xmlWriter.writeStartElement(namespace,"<xsl:value-of select="$propertyName"/>");
-						}
+                        } else {
+                            xmlWriter.writeStartElement(namespace,"<xsl:value-of select="$propertyName"/>");
+                        }
 
-					} else {
-						xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
-					}
+                    } else {
+                        xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
+                    }
 
                              <xsl:choose>
                                  <!-- handle the binary case -->
@@ -820,25 +820,25 @@
                         <xsl:choose>
                             <xsl:when test="$nillable">
                                       if (<xsl:value-of select="$varName"/>==null){
-				        java.lang.String namespace = "<xsl:value-of select="property/@nsuri"/>";
+                        java.lang.String namespace = "<xsl:value-of select="property/@nsuri"/>";
 
-						if (! namespace.equals("")) {
-							java.lang.String prefix = xmlWriter.getPrefix(namespace);
+                        if (! namespace.equals("")) {
+                            java.lang.String prefix = xmlWriter.getPrefix(namespace);
 
-							if (prefix == null) {
-								prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                            if (prefix == null) {
+                                prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
 
-								xmlWriter.writeStartElement(prefix,"<xsl:value-of select="property/@name"/>", namespace);
-								xmlWriter.writeNamespace(prefix, namespace);
-								xmlWriter.setPrefix(prefix, namespace);
+                                xmlWriter.writeStartElement(prefix,"<xsl:value-of select="property/@name"/>", namespace);
+                                xmlWriter.writeNamespace(prefix, namespace);
+                                xmlWriter.setPrefix(prefix, namespace);
 
-							} else {
-								xmlWriter.writeStartElement(namespace,"<xsl:value-of select="property/@name"/>");
-							}
+                            } else {
+                                xmlWriter.writeStartElement(namespace,"<xsl:value-of select="property/@name"/>");
+                            }
 
-						} else {
-							xmlWriter.writeStartElement("<xsl:value-of select="property/@name"/>");
-						}
+                        } else {
+                            xmlWriter.writeStartElement("<xsl:value-of select="property/@name"/>");
+                        }
 
                                         // write the nil attribute
                                         writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","nil","true",xmlWriter);
@@ -861,27 +861,27 @@
                     </xsl:when>
                     <!-- end of ours block-->
                     <xsl:otherwise>
-		        java.lang.String namespace = "<xsl:value-of select="property/@nsuri"/>";
+                java.lang.String namespace = "<xsl:value-of select="property/@nsuri"/>";
 
-			if (! namespace.equals("")) {
-				java.lang.String prefix = xmlWriter.getPrefix(namespace);
+            if (! namespace.equals("")) {
+                java.lang.String prefix = xmlWriter.getPrefix(namespace);
 
-				if (prefix == null) {
-					prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+                if (prefix == null) {
+                    prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
 
-					xmlWriter.writeStartElement(prefix,"<xsl:value-of select="property/@name"/>", namespace);
-					xmlWriter.writeNamespace(prefix, namespace);
-					xmlWriter.setPrefix(prefix, namespace);
+                    xmlWriter.writeStartElement(prefix,"<xsl:value-of select="property/@name"/>", namespace);
+                    xmlWriter.writeNamespace(prefix, namespace);
+                    xmlWriter.setPrefix(prefix, namespace);
 
-				} else {
-					xmlWriter.writeStartElement(namespace,"<xsl:value-of select="property/@name"/>");
-				}
+                } else {
+                    xmlWriter.writeStartElement(namespace,"<xsl:value-of select="property/@name"/>");
+                }
 
-			} else {
-				xmlWriter.writeStartElement("<xsl:value-of select="property/@name"/>");
-			}
+            } else {
+                xmlWriter.writeStartElement("<xsl:value-of select="property/@name"/>");
+            }
 
-			xmlWriter.writeCharacters(
+            xmlWriter.writeCharacters(
                         org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>));
                        xmlWriter.writeEndElement();
                     </xsl:otherwise>
@@ -1217,9 +1217,9 @@
                 </xsl:if>
 
                 <!-- populate attributes here!!!. The attributes are part of an element, not part of a type -->
-				// Note all attributes that were handled. Used to differ normal attributes
-				// from anyAttributes.
-				java.util.Vector handledAttributes = new java.util.Vector();
+                // Note all attributes that were handled. Used to differ normal attributes
+                // from anyAttributes.
+                java.util.Vector handledAttributes = new java.util.Vector();
                 <xsl:for-each select="property[@attribute]">
                     <xsl:variable name="propertyName" select="@name"/>
                     <xsl:variable name="propertyType" select="@type"/>
@@ -1230,8 +1230,8 @@
                     <xsl:variable name="namespace" select="@nsuri"/>
                     <xsl:variable name="attribName">tempAttrib<xsl:value-of select="$propertyName"/></xsl:variable>
 
-					<xsl:if test="$propertyName != 'extraAttributes'">
-					// handle attribute "<xsl:value-of select="$propertyName"/>"
+                    <xsl:if test="$propertyName != 'extraAttributes'">
+                    // handle attribute "<xsl:value-of select="$propertyName"/>"
                     java.lang.String <xsl:value-of select="$attribName"/> =
                       reader.getAttributeValue("<xsl:value-of select="$namespace"/>","<xsl:value-of select="$propertyName"/>");
                    if (<xsl:value-of select="$attribName"/>!=null){
@@ -1239,30 +1239,30 @@
                            org.apache.axis2.databinding.utils.ConverterUtil.convertTo<xsl:value-of select="$shortTypeName"/>(
                                 <xsl:value-of select="$attribName"/>));
                     }
-					handledAttributes.add("<xsl:value-of select="$propertyName"/>");
-					</xsl:if>
+                    handledAttributes.add("<xsl:value-of select="$propertyName"/>");
+                    </xsl:if>
 
-					<!-- Handle anyAttributes here -->
-					<xsl:if test="$propertyName = 'extraAttributes'">
-						// now run through all any or extra attributes
-						// which were not reflected until now
-						for (int i=0; i &lt; reader.getAttributeCount(); i++) {
-							if (!handledAttributes.contains(reader.getAttributeLocalName(i))) {
-								// this is an anyAttribute and we create
-								// an OMAttribute for this
-								org.apache.axiom.om.impl.llom.OMAttributeImpl attr =
-									new org.apache.axiom.om.impl.llom.OMAttributeImpl(
-											reader.getAttributeLocalName(i),
-											new org.apache.axiom.om.impl.dom.NamespaceImpl(
-												reader.getAttributeNamespace(i), reader.getAttributePrefix(i)),
-											reader.getAttributeValue(i),
-											org.apache.axiom.om.OMAbstractFactory.getOMFactory());
-
-								// and add it to the extra attributes
-								object.addExtraAttributes(attr);
-							}
-						}
-					</xsl:if>
+                    <!-- Handle anyAttributes here -->
+                    <xsl:if test="$propertyName = 'extraAttributes'">
+                        // now run through all any or extra attributes
+                        // which were not reflected until now
+                        for (int i=0; i &lt; reader.getAttributeCount(); i++) {
+                            if (!handledAttributes.contains(reader.getAttributeLocalName(i))) {
+                                // this is an anyAttribute and we create
+                                // an OMAttribute for this
+                                org.apache.axiom.om.impl.llom.OMAttributeImpl attr =
+                                    new org.apache.axiom.om.impl.llom.OMAttributeImpl(
+                                            reader.getAttributeLocalName(i),
+                                            new org.apache.axiom.om.impl.dom.NamespaceImpl(
+                                                reader.getAttributeNamespace(i), reader.getAttributePrefix(i)),
+                                            reader.getAttributeValue(i),
+                                            org.apache.axiom.om.OMAbstractFactory.getOMFactory());
+
+                                // and add it to the extra attributes
+                                object.addExtraAttributes(attr);
+                            }
+                        }
+                    </xsl:if>
 
                 </xsl:for-each>
 
@@ -1632,10 +1632,10 @@
         </xsl:if>
 
 
-	<xsl:choose>
-	<xsl:when test="not(@helper)">
+    <xsl:choose>
+    <xsl:when test="not(@helper)">
 
-	public <xsl:if test="not(@unwrapped) or (@skip-write)">static</xsl:if> class <xsl:value-of select="$name"/> <xsl:if test="$extension"> extends <xsl:value-of select="$extension"/></xsl:if>
+    public <xsl:if test="not(@unwrapped) or (@skip-write)">static</xsl:if> class <xsl:value-of select="$name"/> <xsl:if test="$extension"> extends <xsl:value-of select="$extension"/></xsl:if>
         {
         <xsl:choose>
             <xsl:when test="@type">/* This type was generated from the piece of schema that had
@@ -1823,9 +1823,9 @@
         </xsl:for-each>
 
    }
-	</xsl:when>
-	<xsl:otherwise>
-	<!--  Start of helper generation part of the template-->
+    </xsl:when>
+    <xsl:otherwise>
+    <!--  Start of helper generation part of the template-->
 public <xsl:if test="not(@unwrapped) or (@skip-write)">static</xsl:if> class <xsl:value-of select="$helpername"/> {
 
      <!-- get OMElement methods that allows direct writing. generated inside the helper class-->
@@ -1867,32 +1867,32 @@
                     <xsl:variable name="varName">typedBean.local<xsl:value-of select="@javaname"/></xsl:variable>
                      <xsl:variable name="namespace"><xsl:value-of select="@nsuri"/></xsl:variable>
                     <xsl:choose>
-						<!-- Note - It is assumed that any attributes are OMAttributes-->
+                        <!-- Note - It is assumed that any attributes are OMAttributes-->
                         <xsl:when test="@any and not(@array)">
                             writeAttribute(<xsl:value-of select="$varName"/>.getNamespace().getName(),
                                                      <xsl:value-of select="$varName"/>.getLocalName(),
                                                      <xsl:value-of select="$varName"/>.getAttributeValue(),xmlWriter);
                         </xsl:when>
                         <xsl:when test="@any and @array">
-							 if (<xsl:value-of select="$varName"/> != null) {
-								 for (int i=0;i &lt;<xsl:value-of select="$varName"/>.length;i++){
-									 writeAttribute(<xsl:value-of select="$varName"/>[i].getNamespace().getName(),
+                             if (<xsl:value-of select="$varName"/> != null) {
+                                 for (int i=0;i &lt;<xsl:value-of select="$varName"/>.length;i++){
+                                     writeAttribute(<xsl:value-of select="$varName"/>[i].getNamespace().getName(),
                                                     <xsl:value-of select="$varName"/>[i].getLocalName(),
                                                     <xsl:value-of select="$varName"/>[i].getAttributeValue(),xmlWriter);
-									 }
-							 }
+                                     }
+                             }
                         </xsl:when>
                         <!-- there can never be attribute arrays in the normal case-->
                         <xsl:when test="@optional">
- 							// optional attribute <xsl:value-of select="$propertyName"/>
- 							try {
-								writeAttribute("<xsl:value-of select="$namespace"/>",
+                             // optional attribute <xsl:value-of select="$propertyName"/>
+                             try {
+                                writeAttribute("<xsl:value-of select="$namespace"/>",
                                                "<xsl:value-of select="$propertyName"/>",
                                                org.apache.axis2.databinding.utils.ConverterUtil.convertToString(<xsl:value-of select="$varName"/>), xmlWriter);
-							} catch (NullPointerException e) {
-								// If <xsl:value-of select="$varName"/> was null
-								// it can not be serialized.
-							}
+                            } catch (NullPointerException e) {
+                                // If <xsl:value-of select="$varName"/> was null
+                                // it can not be serialized.
+                            }
                         </xsl:when>
                         <xsl:otherwise>
                              writeAttribute("<xsl:value-of select="$namespace"/>",
@@ -2555,7 +2555,7 @@
             return object;
         }
 
-	 public static javax.xml.stream.XMLStreamReader getPullParser(java.lang.Object beanObject, javax.xml.namespace.QName qName){
+     public static javax.xml.stream.XMLStreamReader getPullParser(java.lang.Object beanObject, javax.xml.namespace.QName qName){
 
         <xsl:value-of select="@package"/>.<xsl:value-of select="@name"/> bean =
          (<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>)beanObject;
@@ -2758,8 +2758,8 @@
         }
 
 }
-	</xsl:otherwise>
-	</xsl:choose>
+    </xsl:otherwise>
+    </xsl:choose>
            <!-- end of main template -->
   </xsl:template>
 

Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl?view=diff&rev=442716&r1=442715&r2=442716
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl Tue Sep 12 14:38:40 2006
@@ -41,18 +41,18 @@
                     <xsl:variable name="inputElementType" select="../../param[@type!='' and @direction='in' and @opname=$opname]/@type"></xsl:variable>
                     <xsl:variable name="wrappedParameterCount" select="count(../../param[@type!='' and @direction='in' and @opname=$opname]/param)"></xsl:variable>
                      <xsl:choose>
-						<xsl:when test="$wrappedParameterCount &gt; 0">
+                        <xsl:when test="$wrappedParameterCount &gt; 0">
                             <!-- geneate the toEnvelope method-->
                         private  org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory,
-							<xsl:for-each select="../../param[@type!='' and @direction='in' and @opname=$opname]/param">
-							 <xsl:value-of select="@type"/> param<xsl:value-of select="position()"/>,
-							</xsl:for-each>
-						 boolean optimizeContent){
-
-						<xsl:value-of select="$inputElementType"/> wrappedType = new <xsl:value-of select="$inputElementType"/>();
-						 	<xsl:for-each select="../../param[@type!='' and @direction='in' and @opname=$opname]/param">
-							  wrappedType.set<xsl:value-of select="@partname"/>(param<xsl:value-of select="position()"/>);
-						 </xsl:for-each>
+                            <xsl:for-each select="../../param[@type!='' and @direction='in' and @opname=$opname]/param">
+                             <xsl:value-of select="@type"/> param<xsl:value-of select="position()"/>,
+                            </xsl:for-each>
+                         boolean optimizeContent){
+
+                        <xsl:value-of select="$inputElementType"/> wrappedType = new <xsl:value-of select="$inputElementType"/>();
+                             <xsl:for-each select="../../param[@type!='' and @direction='in' and @opname=$opname]/param">
+                              wrappedType.set<xsl:value-of select="@partname"/>(param<xsl:value-of select="position()"/>);
+                         </xsl:for-each>
 
 
                        org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope();
@@ -73,10 +73,10 @@
 
 
                         </xsl:when>
-						<xsl:otherwise>
+                        <xsl:otherwise>
                             <xsl:if test="generate-id($inputElement) = generate-id(key('paramsIn', $inputElementType)[1])">
                         <!-- Assumption - the parameter is always an ADB element-->
-				    private  org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="$inputElementType"/> param, boolean optimizeContent){
+                    private  org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="$inputElementType"/> param, boolean optimizeContent){
                     org.apache.axiom.soap.SOAPEnvelope emptyEnvelope = factory.getDefaultEnvelope();
                          <xsl:choose>
                             <xsl:when test="$helpermode">
@@ -91,8 +91,8 @@
                      return emptyEnvelope;
                     }
                              </xsl:if>
-						</xsl:otherwise>
-					 </xsl:choose>
+                        </xsl:otherwise>
+                     </xsl:choose>
                </xsl:when>
                <xsl:otherwise>
                   <!-- Do nothing here -->

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl?view=diff&rev=442716&r1=442715&r2=442716
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl Tue Sep 12 14:38:40 2006
@@ -17,26 +17,26 @@
 
 
 
-	protected Object clientData;
+    protected Object clientData;
 
 
-	/**
-	* User can pass in any object that needs to be accessed once the NonBlocking
-	* Web service call is finished and appropreate method of this CallBack is called.
-	* @param clientData Object mechanism by which the user can pass in user data
-	* that will be avilable at the time this callback is called.
-	*/
-	public <xsl:value-of select="@name"/>(Object clientData){
-		this.clientData = clientData;
-	}
+    /**
+    * User can pass in any object that needs to be accessed once the NonBlocking
+    * Web service call is finished and appropreate method of this CallBack is called.
+    * @param clientData Object mechanism by which the user can pass in user data
+    * that will be avilable at the time this callback is called.
+    */
+    public <xsl:value-of select="@name"/>(Object clientData){
+        this.clientData = clientData;
+    }
 
     /**
      * Get the client data
      */
 
      public Object getClientData() {
-		return clientData;
-	 }
+        return clientData;
+     }
 
         <xsl:for-each select="method">
             <xsl:variable name="outParamType"><xsl:value-of select="output/param/@type"/></xsl:variable>

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?view=diff&rev=442716&r1=442715&r2=442716
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Tue Sep 12 14:38:40 2006
@@ -43,28 +43,28 @@
         private java.util.HashMap faultExeptionClassNameMap = new java.util.HashMap();
         private java.util.HashMap faultMessageMap = new java.util.HashMap();
 
-	
+    
     private void populateAxisService(){
 
      //creating the Service with a unique name
      _service = new org.apache.axis2.description.AxisService("<xsl:value-of select="@servicename"/>" + this.hashCode());
-	<xsl:if test="@policy">
-	/*
-	 * setting the endpont policy
-	 */
-	 java.lang.String _service_policy_string = "<xsl:value-of select="@policy"/>";
-	 org.apache.axis2.description.PolicyInclude servicePolicyInclude
-	 	= _service.getPolicyInclude();
-	 servicePolicyInclude.addPolicyElement(
-	 		org.apache.axis2.description.PolicyInclude.SERVICE_POLICY,
-	 		getPolicyFromString(_service_policy_string));
-	</xsl:if>
+    <xsl:if test="@policy">
+    /*
+     * setting the endpont policy
+     */
+     java.lang.String _service_policy_string = "<xsl:value-of select="@policy"/>";
+     org.apache.axis2.description.PolicyInclude servicePolicyInclude
+         = _service.getPolicyInclude();
+     servicePolicyInclude.addPolicyElement(
+             org.apache.axis2.description.PolicyInclude.SERVICE_POLICY,
+             getPolicyFromString(_service_policy_string));
+    </xsl:if>
 
         //creating the operations
         org.apache.axis2.description.AxisOperation __operation;
-	<xsl:if test="//method[@policy]">
-	java.lang.String __operation_policy_string;
-	</xsl:if>
+    <xsl:if test="//method[@policy]">
+    java.lang.String __operation_policy_string;
+    </xsl:if>
 
 
         _operations = new org.apache.axis2.description.AxisOperation[<xsl:value-of select="count(method)"/>];
@@ -80,16 +80,16 @@
 
             __operation.setName(new javax.xml.namespace.QName("<xsl:value-of select="@namespace"/>", "<xsl:value-of select="@name"/>"));
 
-	    <xsl:if test="@policy">
-	    __operation_policy_string = "<xsl:value-of select="@policy"/>";
-	    org.apache.ws.policy.Policy __operation_policy
-	    		= getPolicyFromString(__operation_policy_string);
-	    org.apache.axis2.description.PolicyInclude include
-	    		= __operation.getPolicyInclude();
-	    include.addPolicyElement(org.apache.axis2.description.PolicyInclude.ANON_POLICY,
-	    		__operation_policy);
+        <xsl:if test="@policy">
+        __operation_policy_string = "<xsl:value-of select="@policy"/>";
+        org.apache.ws.policy.Policy __operation_policy
+                = getPolicyFromString(__operation_policy_string);
+        org.apache.axis2.description.PolicyInclude include
+                = __operation.getPolicyInclude();
+        include.addPolicyElement(org.apache.axis2.description.PolicyInclude.ANON_POLICY,
+                __operation_policy);
 
-	    </xsl:if>
+        </xsl:if>
 
             _operations[<xsl:value-of select="position()-1"/>]=__operation;
             _service.addOperation(__operation);
@@ -134,27 +134,27 @@
         configurationContext = _serviceClient.getServiceContext().getConfigurationContext();
 
     <xsl:if test="//@policy">
-	
-	////////////////////////////////////////////////////////////////////////
-		
-	org.apache.axis2.engine.AxisConfiguration axisConfiguration = configurationContext.getAxisConfiguration();
-	java.util.Collection modules = axisConfiguration.getModules().values();
-		
-	for (java.util.Iterator iterator = modules.iterator(); iterator.hasNext();) {
-		org.apache.axis2.description.AxisModule axisModule = (org.apache.axis2.description.AxisModule) iterator.next();
-		java.lang.String[] namespaces = axisModule.getSupportedPolicyNamespaces();
-			
-		if (namespaces != null) {
-			for (int i = 0; i &lt; namespaces.length; i++) {
-				ns2Modules.put(namespaces[i], axisModule);
-			}
-		}
-	}
-				
-	////////////////////////////////////////////////////////////////////////
-		
-	</xsl:if>
-	
+    
+    ////////////////////////////////////////////////////////////////////////
+        
+    org.apache.axis2.engine.AxisConfiguration axisConfiguration = configurationContext.getAxisConfiguration();
+    java.util.Collection modules = axisConfiguration.getModules().values();
+        
+    for (java.util.Iterator iterator = modules.iterator(); iterator.hasNext();) {
+        org.apache.axis2.description.AxisModule axisModule = (org.apache.axis2.description.AxisModule) iterator.next();
+        java.lang.String[] namespaces = axisModule.getSupportedPolicyNamespaces();
+            
+        if (namespaces != null) {
+            for (int i = 0; i &lt; namespaces.length; i++) {
+                ns2Modules.put(namespaces[i], axisModule);
+            }
+        }
+    }
+                
+    ////////////////////////////////////////////////////////////////////////
+        
+    </xsl:if>
+    
 
         _serviceClient.getOptions().setTo(new org.apache.axis2.addressing.EndpointReference(
                 targetEndpoint));
@@ -162,20 +162,20 @@
             //Set the soap version
             _serviceClient.getOptions().setSoapVersionURI(org.apache.axiom.soap.SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         </xsl:if>
-	
-	<xsl:if test="//@policy">
-	////////////////////////////////////////////////////////////////////////
-	
-	org.apache.axis2.description.AxisOperation axisOperation;
-        
-	for (java.util.Iterator iterator = _service.getChildren(); iterator.hasNext(); ){
-    		// Engaging the modules per AxisOperation 
-		axisOperation = (org.apache.axis2.description.AxisOperation) iterator.next();
-		engage(axisOperation, configurationContext.getAxisConfiguration());
-	}	
     
-	///////////////////////////////////////////////////////////////////////
-	</xsl:if>
+    <xsl:if test="//@policy">
+    ////////////////////////////////////////////////////////////////////////
+    
+    org.apache.axis2.description.AxisOperation axisOperation;
+        
+    for (java.util.Iterator iterator = _service.getChildren(); iterator.hasNext(); ){
+            // Engaging the modules per AxisOperation 
+        axisOperation = (org.apache.axis2.description.AxisOperation) iterator.next();
+        engage(axisOperation, configurationContext.getAxisConfiguration());
+    }    
+    
+    ///////////////////////////////////////////////////////////////////////
+    </xsl:if>
     }
 
     /**
@@ -208,11 +208,11 @@
             <xsl:variable name="style"><xsl:value-of select="@style"></xsl:value-of></xsl:variable>
             <xsl:variable name="soapAction"><xsl:value-of select="@soapaction"></xsl:value-of></xsl:variable>
             <xsl:variable name="mep"><xsl:value-of select="@mep"/></xsl:variable>
-	    
-	    <!-- MTOM -->
-	    <xsl:variable name="method-name"><xsl:value-of select="@name"/></xsl:variable>
-	    <xsl:variable name="method-ns"><xsl:value-of select="@namespace"/> </xsl:variable>
-	    <!-- MTOM -->
+        
+        <!-- MTOM -->
+        <xsl:variable name="method-name"><xsl:value-of select="@name"/></xsl:variable>
+        <xsl:variable name="method-ns"><xsl:value-of select="@namespace"/> </xsl:variable>
+        <!-- MTOM -->
 
             <!-- Code generation for the in-out mep -->
             <xsl:if test="$mep='12'">  <!-- These constants can be found in org.apache.axis2.wsdl.WSDLConstants -->
@@ -715,110 +715,110 @@
     }
 
     <xsl:if test="//@policy">
-	
-	/** */
-	private java.util.HashMap ns2Modules = new java.util.HashMap();
-	
-	////////////////////////////////////////////////////////////////////////
-	
-	private static org.apache.ws.policy.Policy getPolicyFromString (java.lang.String policyString) {
-		org.apache.ws.policy.util.PolicyReader prdr 
-			= org.apache.ws.policy.util.PolicyFactory.getPolicyReader(
-					org.apache.ws.policy.util.PolicyFactory.OM_POLICY_READER);
-		try {
-			if (policyString != null 
-				&amp;&amp; !policyString.trim().equals("")) {
-					return prdr.readPolicy(
-						new java.io.ByteArrayInputStream(
-						policyString.getBytes()));
-			}
-		
-		} catch (Exception e) {
-			throw new RuntimeException(
-				"cannot convert "+ policyString	+ " to policy", e);
-		}
-		return null;
-	}
-	
-	private static org.apache.ws.policy.Policy merge(java.lang.String policyString1,
-		java.lang.String policyString2) {
-		return (org.apache.ws.policy.Policy) getPolicyFromString(policyString1)
-			.merge(getPolicyFromString(policyString2));
-	}
-	
-
-	private java.util.ArrayList getModules(java.util.List termsList) {
-		java.util.ArrayList arrayList = new java.util.ArrayList();
-		java.util.Iterator iterator = termsList.iterator();
-		
-		org.apache.ws.policy.PrimitiveAssertion pa;
-		java.lang.String namespace;
-		org.apache.axis2.description.AxisModule axisModule;
-		
-		while (iterator.hasNext()) {
-			pa = (org.apache.ws.policy.PrimitiveAssertion) iterator.next();
-			namespace = pa.getName().getNamespaceURI();
-			axisModule = (org.apache.axis2.description.AxisModule) ns2Modules.get(namespace);
-			
-			if (axisModule == null) {
-				// TODO
-				System.err.println("Warning: cannot find a module for process PrimitiveAssertion - " + pa.getName());
-			}			
-			arrayList.add(axisModule);
-		}
-		
-		return arrayList;
-	}
-	private void engage(org.apache.axis2.description.AxisDescription axisDescription, org.apache.axis2.engine.AxisConfiguration axisConfiguration) throws org.apache.axis2.AxisFault {
-		
-		org.apache.axis2.description.PolicyInclude policyInclude = axisDescription.getPolicyInclude();
-		org.apache.ws.policy.Policy policy = policyInclude.getEffectivePolicy();
-		
-		if (policy == null) {
-			return;
-		}
-		
-		if (! policy.isNormalized()) {
-			policy = (org.apache.ws.policy.Policy) policy.normalize();
-		}
-		
-		org.apache.ws.policy.ExactlyOne xor = (org.apache.ws.policy.ExactlyOne) policy.getTerms().get(0);
-		if (xor.isEmpty()) {
-			// TODO
-			throw new RuntimeException("No policy alternative found");
-		}
-		org.apache.ws.policy.All anAlternative = (org.apache.ws.policy.All) xor.getTerms().get(0);
-		java.util.List moduleList = getModules(anAlternative.getTerms());
-		
-		if (axisDescription instanceof org.apache.axis2.description.AxisService) {
-			for (java.util.Iterator iterator = moduleList.iterator(); iterator.hasNext();) {
-				((org.apache.axis2.description.AxisService) axisDescription).engageModule((org.apache.axis2.description.AxisModule) iterator.next(), axisConfiguration);
-			}
-		} else if (axisDescription instanceof org.apache.axis2.description.AxisOperation) {
-			for (java.util.Iterator iterator = moduleList.iterator(); iterator.hasNext();) {
-				((org.apache.axis2.description.AxisOperation) axisDescription).engageModule((org.apache.axis2.description.AxisModule) iterator.next(), axisConfiguration);
-			}
-		}
-	}
+    
+    /** */
+    private java.util.HashMap ns2Modules = new java.util.HashMap();
+    
+    ////////////////////////////////////////////////////////////////////////
+    
+    private static org.apache.ws.policy.Policy getPolicyFromString (java.lang.String policyString) {
+        org.apache.ws.policy.util.PolicyReader prdr 
+            = org.apache.ws.policy.util.PolicyFactory.getPolicyReader(
+                    org.apache.ws.policy.util.PolicyFactory.OM_POLICY_READER);
+        try {
+            if (policyString != null 
+                &amp;&amp; !policyString.trim().equals("")) {
+                    return prdr.readPolicy(
+                        new java.io.ByteArrayInputStream(
+                        policyString.getBytes()));
+            }
+        
+        } catch (Exception e) {
+            throw new RuntimeException(
+                "cannot convert "+ policyString    + " to policy", e);
+        }
+        return null;
+    }
+    
+    private static org.apache.ws.policy.Policy merge(java.lang.String policyString1,
+        java.lang.String policyString2) {
+        return (org.apache.ws.policy.Policy) getPolicyFromString(policyString1)
+            .merge(getPolicyFromString(policyString2));
+    }
+    
+
+    private java.util.ArrayList getModules(java.util.List termsList) {
+        java.util.ArrayList arrayList = new java.util.ArrayList();
+        java.util.Iterator iterator = termsList.iterator();
+        
+        org.apache.ws.policy.PrimitiveAssertion pa;
+        java.lang.String namespace;
+        org.apache.axis2.description.AxisModule axisModule;
+        
+        while (iterator.hasNext()) {
+            pa = (org.apache.ws.policy.PrimitiveAssertion) iterator.next();
+            namespace = pa.getName().getNamespaceURI();
+            axisModule = (org.apache.axis2.description.AxisModule) ns2Modules.get(namespace);
+            
+            if (axisModule == null) {
+                // TODO
+                System.err.println("Warning: cannot find a module for process PrimitiveAssertion - " + pa.getName());
+            }            
+            arrayList.add(axisModule);
+        }
+        
+        return arrayList;
+    }
+    private void engage(org.apache.axis2.description.AxisDescription axisDescription, org.apache.axis2.engine.AxisConfiguration axisConfiguration) throws org.apache.axis2.AxisFault {
+        
+        org.apache.axis2.description.PolicyInclude policyInclude = axisDescription.getPolicyInclude();
+        org.apache.ws.policy.Policy policy = policyInclude.getEffectivePolicy();
+        
+        if (policy == null) {
+            return;
+        }
+        
+        if (! policy.isNormalized()) {
+            policy = (org.apache.ws.policy.Policy) policy.normalize();
+        }
+        
+        org.apache.ws.policy.ExactlyOne xor = (org.apache.ws.policy.ExactlyOne) policy.getTerms().get(0);
+        if (xor.isEmpty()) {
+            // TODO
+            throw new RuntimeException("No policy alternative found");
+        }
+        org.apache.ws.policy.All anAlternative = (org.apache.ws.policy.All) xor.getTerms().get(0);
+        java.util.List moduleList = getModules(anAlternative.getTerms());
+        
+        if (axisDescription instanceof org.apache.axis2.description.AxisService) {
+            for (java.util.Iterator iterator = moduleList.iterator(); iterator.hasNext();) {
+                ((org.apache.axis2.description.AxisService) axisDescription).engageModule((org.apache.axis2.description.AxisModule) iterator.next(), axisConfiguration);
+            }
+        } else if (axisDescription instanceof org.apache.axis2.description.AxisOperation) {
+            for (java.util.Iterator iterator = moduleList.iterator(); iterator.hasNext();) {
+                ((org.apache.axis2.description.AxisOperation) axisDescription).engageModule((org.apache.axis2.description.AxisModule) iterator.next(), axisConfiguration);
+            }
+        }
+    }
 
-	</xsl:if>
-	
+    </xsl:if>
+    
     private javax.xml.namespace.QName[] opNameArray = null;
-	private boolean optimizeContent(javax.xml.namespace.QName opName) {
+    private boolean optimizeContent(javax.xml.namespace.QName opName) {
         <xsl:if test="stubMethods">
             setOpNameArray();
         </xsl:if>
 
         if (opNameArray == null) {
-			return false;
-		}
-		for (int i = 0; i &lt; opNameArray.length; i++) {
-			if (opName.equals(opNameArray[i])) {
-				return true;   
-			}
-		}
-		return false;
-	}
+            return false;
+        }
+        for (int i = 0; i &lt; opNameArray.length; i++) {
+            if (opName.equals(opNameArray[i])) {
+                return true;   
+            }
+        }
+        return false;
+    }
 
 
      <!-- write the classes for the exceptions if there are any present -->

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl?view=diff&rev=442716&r1=442715&r2=442716
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl Tue Sep 12 14:38:40 2006
@@ -29,8 +29,8 @@
      */
 
     public interface <xsl:value-of select="@name"></xsl:value-of> {
- 		 <xsl:for-each select="method">
-		    <!-- Code for in-out mep -->
+          <xsl:for-each select="method">
+            <!-- Code for in-out mep -->
          <xsl:if test="@mep='12'">
          <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
 

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl?view=diff&rev=442716&r1=442715&r2=442716
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/PolicyExtensionTemplate.xsl Tue Sep 12 14:38:40 2006
@@ -1,41 +1,41 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-	<xsl:template match="module-codegen-policy-extensions">
-		
-		<xsl:if test="//createSequence">
-		/**
-		 * Starts a reliabel message sequence
-		 */
-		public void startSequence() {
-			_getServiceClient().getOptions().setProperty("START_RM_SEQUENCE", "true");			
-		}
-		</xsl:if>
-		
-		<xsl:if test="//setLastMessage">
-		/**
-		 * Marks the last message for the sequence
-		 */
-		 public void setLastMessage() {
-		 	_getServiceClient().getOptions().setProperty("Sandesha2ClientAPIPropertyWSRMLastMessage", "true");
-		 }
-		</xsl:if>
-		
-		<xsl:if test="//endSequence">
-		/**
-		 * Terminates the reliabel message sequence
-		 */
-		public void endSequence() {
-			_getServiceClient().getOptions().setProperty("END_RM_SEQUENCE", "true");
-		}
-		</xsl:if>
-		
-		<xsl:variable name="optimized">
-			<xsl:value-of select="//optimizeContent"/>
-		</xsl:variable>
-		
-		
-		<xsl:if test="//security-codegen-policy-extensions/usernametoken-action">
+    <xsl:template match="module-codegen-policy-extensions">
+        
+        <xsl:if test="//createSequence">
+        /**
+         * Starts a reliabel message sequence
+         */
+        public void startSequence() {
+            _getServiceClient().getOptions().setProperty("START_RM_SEQUENCE", "true");            
+        }
+        </xsl:if>
+        
+        <xsl:if test="//setLastMessage">
+        /**
+         * Marks the last message for the sequence
+         */
+         public void setLastMessage() {
+             _getServiceClient().getOptions().setProperty("Sandesha2ClientAPIPropertyWSRMLastMessage", "true");
+         }
+        </xsl:if>
+        
+        <xsl:if test="//endSequence">
+        /**
+         * Terminates the reliabel message sequence
+         */
+        public void endSequence() {
+            _getServiceClient().getOptions().setProperty("END_RM_SEQUENCE", "true");
+        }
+        </xsl:if>
+        
+        <xsl:variable name="optimized">
+            <xsl:value-of select="//optimizeContent"/>
+        </xsl:variable>
+        
+        
+        <xsl:if test="//security-codegen-policy-extensions/usernametoken-action">
     // auto genenrated stub methods 
     
     public void setUsername(java.lang.String username) {
@@ -45,7 +45,7 @@
     public void setPassword(java.lang.String password) {
         _UTCallback pwCallback = new _UTCallback();
         pwCallback.setPassword(password);
-	_serviceClient
+    _serviceClient
                 .getOptions()
                 .setProperty(
                         org.apache.ws.security.handler.WSHandlerConstants.PASSWORD_TYPE,
@@ -99,25 +99,25 @@
                     org.apache.ws.security.handler.WSHandlerConstants.USER);
         }
     }
-		</xsl:if>
-		
+        </xsl:if>
+        
 
-		<xsl:choose>
-			<xsl:when test="$optimized">
+        <xsl:choose>
+            <xsl:when test="$optimized">
             private void setOpNameArray(){
             opNameArray = new javax.xml.namespace.QName[] {
-			<xsl:for-each select="optimizeContent/opName">
-				<xsl:if test="position()>1">,
-				</xsl:if>new javax.xml.namespace.QName("<xsl:value-of select="@ns-url"/>","<xsl:value-of select="@localName"/>")
-			</xsl:for-each>
-			};
+            <xsl:for-each select="optimizeContent/opName">
+                <xsl:if test="position()>1">,
+                </xsl:if>new javax.xml.namespace.QName("<xsl:value-of select="@ns-url"/>","<xsl:value-of select="@localName"/>")
+            </xsl:for-each>
+            };
            }
            </xsl:when>
-			<xsl:otherwise>
+            <xsl:otherwise>
             private void setOpNameArray(){
             opNameArray = null;
             }
            </xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl?view=diff&rev=442716&r1=442715&r2=442716
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl Tue Sep 12 14:38:40 2006
@@ -15,8 +15,8 @@
      <xsl:for-each select="method">
          <xsl:variable name="count"><xsl:value-of select="count(output/param)"/></xsl:variable>
          <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"/></xsl:variable>
-		 <!-- regardless of the sync or async status, the generated method signature would be just a usual
-	           java method -->
+         <!-- regardless of the sync or async status, the generated method signature would be just a usual
+               java method -->
         /**
          * Auto generated method signature
          */

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl?view=diff&rev=442716&r1=442715&r2=442716
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl Tue Sep 12 14:38:40 2006
@@ -16,8 +16,8 @@
      <xsl:for-each select="method">
          <xsl:variable name="count"><xsl:value-of select="count(output/param)"/></xsl:variable>
          <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"/></xsl:variable>
-		 <!-- regardless of the sync or async status, the generated method signature would be just a usual
-	           java method -->
+         <!-- regardless of the sync or async status, the generated method signature would be just a usual
+               java method -->
         /**
          * Auto generated method signature
          <!--  select only the body parameters  -->

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl?view=diff&rev=442716&r1=442715&r2=442716
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl Tue Sep 12 14:38:40 2006
@@ -118,7 +118,7 @@
             public <xsl:value-of select="$tempCallbackName"/>(){ super(null);}
 
             public void receiveResult<xsl:value-of select="@name"/>(org.apache.axis2.client.async.AsyncResult result) {
-			    assertNotNull(result.getResponseEnvelope().getBody().getFirstElement());
+                assertNotNull(result.getResponseEnvelope().getBody().getFirstElement());
             }
 
             public void receiveError<xsl:value-of select="@name"/>(java.lang.Exception e) {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message