You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/03/04 19:17:07 UTC

svn commit: r514453 [6/26] - in /webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/ src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/wsdl/ src/org/apache/axis2/builder/ src/org/apache/axis2/client/ src/org/apache/axis2/c...

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java Sun Mar  4 10:16:54 2007
@@ -17,34 +17,36 @@
 package org.apache.axis2.dataretrieval;
 
 /**
- * Defines constants referenced in data retrieval classes. 
- */ 
+ * Defines constants referenced in data retrieval classes.
+ */
 public interface DRConstants {
     public interface SPEC_VERSIONS {
         String v1_0 = "Spec_2004_09";
     }
-    
- 
+
+
     public interface SOAPVersion {
-             int v1_1 = 1;
+        int v1_1 = 1;
+
+        int v1_2 = 2;
 
-            int v1_2 = 2;
-    
     }
-    
+
     /**
-     * Defines contants references in WS-Mex specification 
+     * Defines contants references in WS-Mex specification
      */
-    
+
     public interface SPEC {
         String NS_URI = "http://schemas.xmlsoap.org/ws/2004/09/mex";
 
         public interface Actions {
-            String GET_METADATA_REQUEST = "http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Request";
-            String GET_METADATA_RESPONSE = "http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Response";
-            
+            String GET_METADATA_REQUEST =
+                    "http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Request";
+            String GET_METADATA_RESPONSE =
+                    "http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Response";
+
         }
-        
+
         String NS_PREFIX = "mex";
         String GET_METADATA = "GetMetadata";
         String DIALET = "Dialect";
@@ -57,35 +59,35 @@
         String DIALECT_TYPE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
         String DIALECT_TYPE_POLICY = "http://schemas.xmlsoap.org/ws/2004/09/policy";
         String DIALECT_TYPE_SCHEMA = "http://www.w3.org/2001/XMLSchema";
-        
+
     }
-    
- 
-  // Following constants used for configuring Data Locator in axis.xml and services.xml    
+
+
+    // Following constants used for configuring Data Locator in axis.xml and services.xml
     String DATA_LOCATOR_ELEMENT = "dataLocator";
     String DIALECT_LOCATOR_ELEMENT = "dialectLocator";
     String DIALECT_ATTRIBUTE = "dialect";
     String CLASS_ATTRIBUTE = "class";
-    
-  // Service level and Global level type Data Locator
+
+    // Service level and Global level type Data Locator
     String SERVICE_LEVEL = "ServiceLevel";
     String GLOBAL_LEVEL = "GlobalLevel";
 
-  /**
-   * Defines contants references in Service Data 
-   */
-    
-     public interface SERVICE_DATA {
-         String FILE_NAME = "ServiceData.xml";
-         String FILE_TYPE = "svcData";
-            
-         String DATA = "Data";
-         String ENDPOINT_REFERENCE = "EndpointReference";
-         String URL = "URL";
-         String FILE = "file";
-         String DIALECT = "dialect";
-         String IDENTIFIER = "identifier";
-         
-     }
-        
+    /**
+     * Defines contants references in Service Data
+     */
+
+    public interface SERVICE_DATA {
+        String FILE_NAME = "ServiceData.xml";
+        String FILE_TYPE = "svcData";
+
+        String DATA = "Data";
+        String ENDPOINT_REFERENCE = "EndpointReference";
+        String URL = "URL";
+        String FILE = "file";
+        String DIALECT = "dialect";
+        String IDENTIFIER = "identifier";
+
+    }
+
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java Sun Mar  4 10:16:54 2007
@@ -20,38 +20,38 @@
  */
 
 public class Data {
-   Object data;
-   String identifier;
-       
-      
-   /**
-    * Constructor
+    Object data;
+    String identifier;
+
+
+    /**
+     * Constructor
      *
-    * @param in_data          instance of Object about the data
-    * @param in_identifier    identifier of the data instance.
-    */
-   public Data(Object in_data, String in_identifier){
-       super();
-       data = in_data;
-       identifier =in_identifier;
-   }
-   
-   /**
-    * Returns data
+     * @param in_data       instance of Object about the data
+     * @param in_identifier identifier of the data instance.
+     */
+    public Data(Object in_data, String in_identifier) {
+        super();
+        data = in_data;
+        identifier = in_identifier;
+    }
+
+    /**
+     * Returns data
      *
-    * @return data Object
-    */
-   
-   public Object getData(){
-       return data;
-   }
-   
-   /**
-    * Returns string representing identifier of this data object.
+     * @return data Object
+     */
+
+    public Object getData() {
+        return data;
+    }
+
+    /**
+     * Returns string representing identifier of this data object.
      *
-    * @return
-    */
-   public String getIdentifier(){
-       return identifier;
-   }
+     * @return
+     */
+    public String getIdentifier() {
+        return identifier;
+    }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java Sun Mar  4 10:16:54 2007
@@ -22,41 +22,42 @@
  */
 
 public class DataLocatorFactory {
-  private static org.apache.axis2.dataretrieval.WSDLDataLocator wsdlDataLocator = null;
-  private static org.apache.axis2.dataretrieval.PolicyDataLocator policyDataLocator = null;
-  private static org.apache.axis2.dataretrieval.SchemaDataLocator schemaDataLocator = null;
-     
-  /*
-   * Return instance of default Data Locator for the dialect.
-   */
-  protected static AxisDataLocator createDataLocator(String dialect) {
-      return (createDataLocator(dialect, null));
-  }
-  
-  protected static AxisDataLocator createDataLocator(String dialect, ServiceData[] serviceDataArray) {
-      AxisDataLocator dataLocator = null;
-      if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_WSDL)){
-          dataLocator = getWsdlDataLocator(serviceDataArray); 
-          
+    private static org.apache.axis2.dataretrieval.WSDLDataLocator wsdlDataLocator = null;
+    private static org.apache.axis2.dataretrieval.PolicyDataLocator policyDataLocator = null;
+    private static org.apache.axis2.dataretrieval.SchemaDataLocator schemaDataLocator = null;
+
+    /*
+    * Return instance of default Data Locator for the dialect.
+    */
+    protected static AxisDataLocator createDataLocator(String dialect) {
+        return (createDataLocator(dialect, null));
+    }
+
+    protected static AxisDataLocator createDataLocator(String dialect,
+                                                       ServiceData[] serviceDataArray) {
+        AxisDataLocator dataLocator = null;
+        if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_WSDL)) {
+            dataLocator = getWsdlDataLocator(serviceDataArray);
+
         } else if (dialect.trim().equals(DRConstants.SPEC.DIALECT_TYPE_POLICY)) {
             if (policyDataLocator == null) {
-              dataLocator = new PolicyDataLocator(serviceDataArray);
+                dataLocator = new PolicyDataLocator(serviceDataArray);
             } else {
-              dataLocator = policyDataLocator;
-      }
+                dataLocator = policyDataLocator;
+            }
         } else if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_SCHEMA)) {
             if (schemaDataLocator == null) {
-              dataLocator = new SchemaDataLocator(serviceDataArray);
+                dataLocator = new SchemaDataLocator(serviceDataArray);
             } else {
-              dataLocator = schemaDataLocator;
-      }
+                dataLocator = schemaDataLocator;
+            }
         } else {
-          dataLocator = null;
-      }
-      return dataLocator;
-  }
-  
-  protected static AxisDataLocator getWsdlDataLocator(ServiceData[] serviceDataArray) {
+            dataLocator = null;
+        }
+        return dataLocator;
+    }
+
+    protected static AxisDataLocator getWsdlDataLocator(ServiceData[] serviceDataArray) {
 
         if (wsdlDataLocator == null) {
             wsdlDataLocator = new org.apache.axis2.dataretrieval.WSDLDataLocator(serviceDataArray);
@@ -65,7 +66,6 @@
         }
         return wsdlDataLocator;
     }
-  
-  
-  
+
+
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java Sun Mar  4 10:16:54 2007
@@ -19,20 +19,21 @@
 import org.apache.axis2.AxisFault;
 
 /**
- * Exception class for reporting Data Retrieval problems 
+ * Exception class for reporting Data Retrieval problems
  */
 
 public class DataRetrievalException extends AxisFault {
-     private static final long serialVersionUID = -374933082062124908L;
-     public DataRetrievalException(String message) {
-            super(message);
-        }
+    private static final long serialVersionUID = -374933082062124908L;
 
-        public DataRetrievalException(Throwable e) {
-            super(e);
-        }
+    public DataRetrievalException(String message) {
+        super(message);
+    }
 
-        public DataRetrievalException(String message, Throwable e) {
-            super(message, e);
-        }
+    public DataRetrievalException(Throwable e) {
+        super(e);
+    }
+
+    public DataRetrievalException(String message, Throwable e) {
+        super(message, e);
+    }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java Sun Mar  4 10:16:54 2007
@@ -20,50 +20,51 @@
 
 /**
  * Allow to specify options/parameters for getData request. The list is extensible
- * based on the information needed for the Data Locator to process the request. 
+ * based on the information needed for the Data Locator to process the request.
  */
 
-public class DataRetrievalRequest extends HashMap{
+public class DataRetrievalRequest extends HashMap {
 
     private static final long serialVersionUID = -374933082062124908L;
-    
+
     /**
      * Key used to define Dialect of data to be retrieved.
      */
-    public final static String DIALET="Dialect";
+    public final static String DIALET = "Dialect";
     /**
      * Key used to defined Identify of data to be retrieved.
      */
     public final static String IDENTIFIER = "Identifier";
     /**
-     * Key used to define the output format of retrieved data to be returned. 
+     * Key used to define the output format of retrieved data to be returned.
      */
     public final static String OUTPUT_FORM = "OutputForm";
-    
-   
+
+
     /**
      * Returns the Dialect value specified in the request.
      *
      * @return a String that has dialect info.
      */
-    
-    public String getDialect() throws DataRetrievalException{
-        String dialect = (String)(get(DIALET));
+
+    public String getDialect() throws DataRetrievalException {
+        String dialect = (String) (get(DIALET));
         if (dialect == null || dialect.length() == 0) {
-            throw new DataRetrievalException("Empty dialect was detected. Dialect must have value.");
+            throw new DataRetrievalException(
+                    "Empty dialect was detected. Dialect must have value.");
         }
-    
+
         return (dialect);
     }
-    
+
     /**
      * Returns the Identifier value specified in the request.
      *
      * @return a String that has Identifier info.
      */
-    
-    public String getIdentifier(){
-        return (String)(get(IDENTIFIER));
+
+    public String getIdentifier() {
+        return (String) (get(IDENTIFIER));
     }
 
     /**
@@ -72,45 +73,46 @@
      * @return output format of data retrieved.
      */
 
-    public OutputForm getOutputForm(){
-        return (OutputForm)(get(OUTPUT_FORM));
+    public OutputForm getOutputForm() {
+        return (OutputForm) (get(OUTPUT_FORM));
     }
-    
+
     /**
      * Allow to set the dialect of data to retrieve
      *
      * @param dialect - Valid dialect value supported by the Data Locator.
      * @throws DataRetrievalException
      */
-    
-    public void putDialect(String dialect)throws DataRetrievalException {
+
+    public void putDialect(String dialect) throws DataRetrievalException {
         if (dialect == null || dialect.length() == 0) {
-            throw new DataRetrievalException("Empty dialect was detected. Dialect must have value.");
+            throw new DataRetrievalException(
+                    "Empty dialect was detected. Dialect must have value.");
         }
-         put(DIALET, dialect);
+        put(DIALET, dialect);
     }
-    
+
     /**
      * Allow to set the identifier of data to retrieve
      *
-     * @param identifier - identifier value 
+     * @param identifier - identifier value
      * @throws DataRetrievalException
      */
-    
+
     public void putIdentifier(String identifier) {
-            put(IDENTIFIER, identifier);
+        put(IDENTIFIER, identifier);
     }
-    
+
     /**
      * Allow to set the output format of the data retrieved.
      *
      * @param form - Valid output format types supported by the Data Locator.
      * @throws DataRetrievalException
      */
-    
+
     public void putOutputForm(OutputForm form) {
         put(OUTPUT_FORM, form);
-}
-    
-    
+    }
+
+
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java Sun Mar  4 10:16:54 2007
@@ -44,10 +44,10 @@
      * Loading xml file content and convert to OMElement.
      *
      * @param file - file path relative to the Service Repository
-     * @return OMElement format of the xml file content 
-     * @throws DataRetrievalException 
+     * @return OMElement format of the xml file content
+     * @throws DataRetrievalException
      */
-    
+
     public OMElement buildOM(ClassLoader classLoader, String file)
             throws DataRetrievalException {
         OMElement element = null;
@@ -67,7 +67,7 @@
      * Convert servicexmlStream to OMElement
      *
      * @param servicexmlStream InputStream contain xml content
-     * @return OMElement format of the xml content 
+     * @return OMElement format of the xml content
      * @throws XMLStreamException
      */
 
@@ -85,14 +85,14 @@
     }
 
     private static InputStream getInputStream(ClassLoader classLoader,
-            String file) throws XMLStreamException {
+                                              String file) throws XMLStreamException {
 
         InputStream servicexmlStream = classLoader.getResourceAsStream(file);
 
         if (servicexmlStream == null) {
             String message = "File does not exist in the Service Repository! File="
                     + file;
-            if(log.isDebugEnabled()) {
+            if (log.isDebugEnabled()) {
                 log.debug(message);
             }
             throw new XMLStreamException(message);

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/LocatorType.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/LocatorType.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/LocatorType.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/LocatorType.java Sun Mar  4 10:16:54 2007
@@ -18,28 +18,28 @@
 
 /**
  * Defines Data Locator types as described below:
- * DEFAULT_AXIS - Default Axis2 data locator 
+ * DEFAULT_AXIS - Default Axis2 data locator
  * GLOBAL_LEVEL - Global level data locator i.e.,plug-in data locator registered
- *                using <dataLocator> element in axis2.xml.
- * GLOBAL_DIALECT - Global level dialect specfic data locator i.e.,plug-in 
- *                  data locator registered using <dialectLocator> element in axis2.xml.
+ * using <dataLocator> element in axis2.xml.
+ * GLOBAL_DIALECT - Global level dialect specfic data locator i.e.,plug-in
+ * data locator registered using <dialectLocator> element in axis2.xml.
  * SERVICE_LEVEL - Service level data locator i.e. plug-in data locator registered
- *                using <dataLocator> element in services.xml.
+ * using <dataLocator> element in services.xml.
  * SERVICE_DIALECT - Service level dialect specific data locator i.e. plug-in data locator registered
- *                using <dialectLocator> element in services.xml.
+ * using <dialectLocator> element in services.xml.
  */
 
 public class LocatorType {
     int type;
-    public final static LocatorType  DEFAULT_AXIS = new LocatorType(0);
-    public final static LocatorType  GLOBAL_LEVEL = new LocatorType(1);
-    public final static LocatorType  GLOBAL_DIALECT = new LocatorType(2);
-    public final static LocatorType  SERVICE_LEVEL = new LocatorType(3);
-    public final static LocatorType  SERVICE_DIALECT = new LocatorType(4);
-    
+    public final static LocatorType DEFAULT_AXIS = new LocatorType(0);
+    public final static LocatorType GLOBAL_LEVEL = new LocatorType(1);
+    public final static LocatorType GLOBAL_DIALECT = new LocatorType(2);
+    public final static LocatorType SERVICE_LEVEL = new LocatorType(3);
+    public final static LocatorType SERVICE_DIALECT = new LocatorType(4);
 
-    protected LocatorType (int intype) {
-        this.type= intype;
+
+    protected LocatorType(int intype) {
+        this.type = intype;
     }
 
     public int getType() {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/OutputForm.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/OutputForm.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/OutputForm.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/OutputForm.java Sun Mar  4 10:16:54 2007
@@ -20,21 +20,21 @@
     String type;
 
     /**
-     *  Possible Output formats as stated in <xs:choice> of <MetadataSection>
-     *  in the WS-MEX specification.
+     * Possible Output formats as stated in <xs:choice> of <MetadataSection>
+     * in the WS-MEX specification.
      */
-    
-    public final static OutputForm  INLINE_FORM = new OutputForm("INLINE_FORM");
-    public final static OutputForm  LOCATION_FORM = new OutputForm("LOCATION_FORM");
-    public final static OutputForm  REFERENCE_FORM = new OutputForm("REFERENCE_FORM");
-    
-    protected OutputForm (String intype) {
-        this.type= intype;
+
+    public final static OutputForm INLINE_FORM = new OutputForm("INLINE_FORM");
+    public final static OutputForm LOCATION_FORM = new OutputForm("LOCATION_FORM");
+    public final static OutputForm REFERENCE_FORM = new OutputForm("REFERENCE_FORM");
+
+    protected OutputForm(String intype) {
+        this.type = intype;
     }
-    
+
     public String getType() {
         return type;
     }
 
-    
+
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/PolicyDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/PolicyDataLocator.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/PolicyDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/PolicyDataLocator.java Sun Mar  4 10:16:54 2007
@@ -17,12 +17,12 @@
 package org.apache.axis2.dataretrieval;
 
 /**
- * Axis 2 Data Locator responsibles for retrieving Policy  metadata. 
+ * Axis 2 Data Locator responsibles for retrieving Policy  metadata.
  * The class is created as model for policy specific data locator; and also
  * easier for any future implementation policy specific data retrieval logic.
  */
-public class PolicyDataLocator  extends BaseAxisDataLocator implements AxisDataLocator {
-        
+public class PolicyDataLocator extends BaseAxisDataLocator implements AxisDataLocator {
+
     protected PolicyDataLocator() {
 
     }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java Sun Mar  4 10:16:54 2007
@@ -22,8 +22,8 @@
  * easier for any future implementation schema specific data retrieval logic.
  */
 
-public class SchemaDataLocator  extends BaseAxisDataLocator  implements AxisDataLocator {
-    
+public class SchemaDataLocator extends BaseAxisDataLocator implements AxisDataLocator {
+
     protected SchemaDataLocator() {
 
     }
@@ -34,5 +34,5 @@
     protected SchemaDataLocator(ServiceData[] data) {
         dataList = data;
     }
-    
+
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/ServiceData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/ServiceData.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/ServiceData.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/ServiceData.java Sun Mar  4 10:16:54 2007
@@ -23,7 +23,7 @@
 
 /**
  * This represents the service data for a dialect and identifier if specified.
- * Basically, the Data element defined in the ServiceData.xml packaged in 
+ * Basically, the Data element defined in the ServiceData.xml packaged in
  * a Web Service's achieve file.
  */
 
@@ -37,8 +37,8 @@
     String fileName;
 
     /**
-     * Constructor 
-     * 
+     * Constructor
+     *
      * @param in_data an Data element in the ServiceData.
      */
 
@@ -76,8 +76,7 @@
         return data;
     }
 
-    
-    
+
     // Get URL from data Element
     protected String getURL() {
 
@@ -90,14 +89,14 @@
 
         return urlValue;
     }
-    
+
     // Get ENDPOINT_REFERENCE from Data Element
     protected OMElement getEndpointReference() {
         OMElement epr = data.getFirstChildWithName(new QName(
                 DRConstants.SERVICE_DATA.ENDPOINT_REFERENCE));
         return epr;
     }
-    
+
     // Load the file content of the file specified in the file attribute
     // in the data element.
     protected OMElement getFileContent(ClassLoader classloader)

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java Sun Mar  4 10:16:54 2007
@@ -24,39 +24,39 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Axis 2 Data Locator responsibles for retrieving WSDL metadata. 
+ * Axis 2 Data Locator responsibles for retrieving WSDL metadata.
  */
 public class WSDLDataLocator extends BaseAxisDataLocator implements AxisDataLocator {
     private static final Log log = LogFactory.getLog(WSDLDataLocator.class);
-    String serviceURL=null;
-    AxisService theService=null;
-    String request_Identifier=null;
-        
-    
-    protected WSDLDataLocator(){
-    
+    String serviceURL = null;
+    AxisService theService = null;
+    String request_Identifier = null;
+
+
+    protected WSDLDataLocator() {
+
     }
-    
+
     /**
-     * Constructor 
+     * Constructor
      *
-     * @param data an array of ServiceData instance defined in the 
+     * @param data an array of ServiceData instance defined in the
      *             ServiceData.xml for the WSDL dialect.
      */
-    protected WSDLDataLocator(ServiceData[] data){
+    protected WSDLDataLocator(ServiceData[] data) {
         dataList = data;
     }
-    
+
     /**
-     * getData API 
+     * getData API
      * Implement data retrieval logic for WSDL dialect
      */
     public Data[] getData(DataRetrievalRequest request,
-            MessageContext msgContext) throws DataRetrievalException {
+                          MessageContext msgContext) throws DataRetrievalException {
         log.trace("Default WSDL DataLocator getData starts");
 
         request_Identifier = (String) request.getIdentifier();
-    
+
         OutputForm outputform = (OutputForm) request.getOutputForm();
 
         if (outputform == null) { // not defined, defualt to inline
@@ -64,29 +64,31 @@
         }
 
         Data[] output = null;
-                
+
         String outputFormString = outputform.getType();
-     
+
         if (outputform == OutputForm.INLINE_FORM) {
             output = outputInlineForm(msgContext, dataList);
         } else if (outputform == OutputForm.LOCATION_FORM) {
             output = outputLocationForm(dataList);
-            
+
         } else if (outputform == OutputForm.REFERENCE_FORM) {
             output = outputReferenceForm(msgContext, dataList);
-                    
+
         } else {
             output = outputInlineForm(msgContext, dataList);
-            
+
         }
-    
+
         if (output == null) {
             if (log.isTraceEnabled()) {
-                log.trace("Null data return! Data Locator does not know how to handle request for dialect= " + (String) request.getDialect()
-                    + " in the form of " + outputFormString);
+                log.trace(
+                        "Null data return! Data Locator does not know how to handle request for dialect= " +
+                                (String) request.getDialect()
+                                + " in the form of " + outputFormString);
             }
         }
-        
+
 
         log.trace("Default WSDL DataLocator getData ends");
 
@@ -101,35 +103,35 @@
     protected Data[] outputInlineForm(MessageContext msgContext, ServiceData[] dataList)
             throws DataRetrievalException {
         Data[]  result = super.outputInlineForm(msgContext, dataList);
-        
+
         // Do not generate WSDL if Identifier was specified in the request as
         // (1) this is to support ?wsdl request; 
         // (2) Data for specified Identifier must be available to satisfy the GetMetadata request.
-        
-        if (result.length==0 && request_Identifier == null) {
-            log.trace("Default WSDL DataLocator attempt to generates WSDL.");        
-              
+
+        if (result.length == 0 && request_Identifier == null) {
+            log.trace("Default WSDL DataLocator attempt to generates WSDL.");
+
             if (msgContext != null) {
                 theService = msgContext.getAxisService();
                 serviceURL = msgContext.getTo().getAddress();
             } else {
                 throw new DataRetrievalException("MessageContext was not set!");
             }
-    
+
             AxisService2OM axisService2WOM;
             OMElement wsdlElement;
-            
+
             try {
                 String[] exposedEPRs = theService.getEPRs();
                 if (exposedEPRs == null) {
-                    exposedEPRs = new String[] {theService.getEndpointName()};
+                    exposedEPRs = new String[]{theService.getEndpointName()};
                 }
                 axisService2WOM = new AxisService2OM(theService,
-                        exposedEPRs, "document", "literal",
-                    "");
+                                                     exposedEPRs, "document", "literal",
+                                                     "");
                 wsdlElement = axisService2WOM.generateOM();
             }
-            catch (Exception e){
+            catch (Exception e) {
                 log.debug(e);
                 throw new DataRetrievalException(e);
             }
@@ -146,21 +148,21 @@
 
     /*
      * 
-     */    
+     */
     protected Data[] outputLocationForm(ServiceData[] serviceData) throws DataRetrievalException {
-        Data[] result= super.outputLocationForm(serviceData);
-        
+        Data[] result = super.outputLocationForm(serviceData);
+
         // Do not generate URL if Identifier was specified in the request as
         // (1) Axis2 ?wsdl URL request is not supporting Identifier; 
         // (2) URL data for specified Identifier must be available to satisfy
         //     the GetMetadata request.
-    
-        if (result.length==0 && request_Identifier == null) {
-               result = new Data[1];
-               result[0] = new Data( serviceURL + "?wsdl", null);
+
+        if (result.length == 0 && request_Identifier == null) {
+            result = new Data[1];
+            result[0] = new Data(serviceURL + "?wsdl", null);
         }
         return result;
     }
-    
-    
+
+
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java Sun Mar  4 10:16:54 2007
@@ -22,13 +22,13 @@
     }
 
     public MexClient(ConfigurationContext configContext,
-            Definition wsdl4jDefinition, QName wsdlServiceName, String portName)
+                     Definition wsdl4jDefinition, QName wsdlServiceName, String portName)
             throws AxisFault {
         super(configContext, wsdl4jDefinition, wsdlServiceName, portName);
     }
 
     public MexClient(ConfigurationContext configContext, URL wsdlURL,
-            QName wsdlServiceName, String portName) throws AxisFault {
+                     QName wsdlServiceName, String portName) throws AxisFault {
         super(configContext, wsdlURL, wsdlServiceName, portName);
     }
 
@@ -39,23 +39,23 @@
      * Builds OMElement that makes up of SOAP body.
      */
     public OMElement setupGetMetadataRequest(String dialect,
-            String identifier) throws AxisFault {
-        
+                                             String identifier) throws AxisFault {
+
         // Attempt to engage MEX module
-    /*    try{
-           super.engageModule(new QName("metadataExchange"));
-        }
-        catch (Exception e){
-          throw new AxisFault ("Unable to proceed with GetMetadata Request!", e);      
-        } */
-        
+        /*    try{
+          super.engageModule(new QName("metadataExchange"));
+       }
+       catch (Exception e){
+         throw new AxisFault ("Unable to proceed with GetMetadata Request!", e);
+       } */
+
         OMFactory fac = OMAbstractFactory.getOMFactory();
 
         OMNamespace omNs = fac.createOMNamespace(
                 DRConstants.SPEC.NS_URI, DRConstants.SPEC.NS_PREFIX);
 
         OMElement method = fac.createOMElement(DRConstants.SPEC.GET_METADATA,
-                omNs);
+                                               omNs);
         if (dialect != null) {
             OMElement dialect_Elem = fac.createOMElement(
                     DRConstants.SPEC.DIALET, omNs);

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Sun Mar  4 10:16:54 2007
@@ -76,7 +76,8 @@
             OMElement config_element = buildOM();
 
             if (!TAG_AXISCONFIG.equals(config_element.getLocalName())) {
-                throw new DeploymentException(Messages.getMessage("badelementfound", TAG_AXISCONFIG, config_element.getLocalName()));
+                throw new DeploymentException(Messages.getMessage("badelementfound", TAG_AXISCONFIG,
+                                                                  config_element.getLocalName()));
             }
             // processing Parameters
             // Processing service level parameters
@@ -85,7 +86,8 @@
             processParameters(itr, axisConfig, axisConfig);
 
             // process MessageReceiver
-            OMElement messageReceiver = config_element.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVERS));
+            OMElement messageReceiver =
+                    config_element.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVERS));
             if (messageReceiver != null) {
                 HashMap mrs = processMessageReceivers(messageReceiver);
                 Iterator keys = mrs.keySet().iterator();
@@ -101,17 +103,20 @@
             processModuleRefs(moduleitr, axisConfig);
 
             // Processing Transport Senders
-            Iterator trs_senders = config_element.getChildrenWithName(new QName(TAG_TRANSPORT_SENDER));
+            Iterator trs_senders =
+                    config_element.getChildrenWithName(new QName(TAG_TRANSPORT_SENDER));
 
             processTransportSenders(trs_senders);
 
             // Processing Transport Receivers
-            Iterator trs_Reivers = config_element.getChildrenWithName(new QName(TAG_TRANSPORT_RECEIVER));
+            Iterator trs_Reivers =
+                    config_element.getChildrenWithName(new QName(TAG_TRANSPORT_RECEIVER));
 
             processTransportReceivers(trs_Reivers);
 
             // Process TargetResolvers
-            OMElement targetResolvers = config_element.getFirstChildWithName(new QName(TAG_TARGET_RESOLVERS));
+            OMElement targetResolvers =
+                    config_element.getFirstChildWithName(new QName(TAG_TARGET_RESOLVERS));
             processTargetResolvers(axisConfig, targetResolvers);
 
             // Process Observers
@@ -124,24 +129,27 @@
 
             processPhaseOrders(phaseorders);
 
-            Iterator moduleConfigs = config_element.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
+            Iterator moduleConfigs =
+                    config_element.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
 
             processModuleConfig(moduleConfigs, axisConfig, axisConfig);
 
             // processing <wsp:Policy> .. </..> elements
             Iterator policyElements = config_element.getChildrenWithName(new QName(POLICY_NS_URI,
-                    TAG_POLICY));
+                                                                                   TAG_POLICY));
 
             if (policyElements != null && policyElements.hasNext()) {
-                processPolicyElements(PolicyInclude.AXIS_POLICY, policyElements, axisConfig.getPolicyInclude());
+                processPolicyElements(PolicyInclude.AXIS_POLICY, policyElements,
+                                      axisConfig.getPolicyInclude());
             }
 
             // processing <wsp:PolicyReference> .. </..> elements
             Iterator policyRefElements = config_element.getChildrenWithName(new QName(POLICY_NS_URI,
-                    TAG_POLICY_REF));
+                                                                                      TAG_POLICY_REF));
 
             if (policyRefElements != null && policyRefElements.hasNext()) {
-                processPolicyRefElements(PolicyInclude.AXIS_POLICY, policyElements, axisConfig.getPolicyInclude());
+                processPolicyRefElements(PolicyInclude.AXIS_POLICY, policyElements,
+                                         axisConfig.getPolicyInclude());
             }
 
             //to process default module versions
@@ -150,23 +158,24 @@
             if (defaultModuleVerionElement != null) {
                 processDefaultModuleVersions(defaultModuleVerionElement);
             }
-            
+
             OMElement clusterElement = config_element
                     .getFirstChildWithName(new QName(TAG_CLUSTER));
             if (clusterElement != null) {
                 ClusterBuilder clusterBuilder = new ClusterBuilder(axisConfig);
                 clusterBuilder.buildCluster(clusterElement);
             }
-            
+
             /*
-             * Add Axis2 default builders if they are not overidden by the config
-             */
+            * Add Axis2 default builders if they are not overidden by the config
+            */
             axisConfig.addMessageBuilder("multipart/related", new MIMEBuilder());
             axisConfig.addMessageBuilder("application/soap+xml", new SOAPBuilder());
             axisConfig.addMessageBuilder("text/xml", new SOAPBuilder());
             axisConfig.addMessageBuilder("application/xop+xml", new MTOMBuilder());
             // process MessageBuilders
-            OMElement messageBuildersElement = config_element.getFirstChildWithName(new QName(TAG_MESSAGE_BUILDERS));
+            OMElement messageBuildersElement =
+                    config_element.getFirstChildWithName(new QName(TAG_MESSAGE_BUILDERS));
             if (messageBuildersElement != null) {
                 HashMap builderSelector = processMessageBuilders(messageBuildersElement);
                 Iterator keys = builderSelector.keySet().iterator();
@@ -175,30 +184,34 @@
                     axisConfig.addMessageBuilder(key, (Builder) builderSelector.get(key));
                 }
             }
-                axisConfig.addMessageBuilder("application/xml", new ApplicationXMLBuilder());
-                axisConfig.addMessageBuilder("application/x-www-form-urlencoded", new XFormURLEncodedBuilder());
+            axisConfig.addMessageBuilder("application/xml", new ApplicationXMLBuilder());
+            axisConfig.addMessageBuilder("application/x-www-form-urlencoded",
+                                         new XFormURLEncodedBuilder());
 
             //process dataLocator configuration
             OMElement dataLocatorElement =
-            config_element.getFirstChildWithName(new QName(DRConstants.DATA_LOCATOR_ELEMENT));
-            
+                    config_element
+                            .getFirstChildWithName(new QName(DRConstants.DATA_LOCATOR_ELEMENT));
+
             if (dataLocatorElement != null) {
                 processDataLocatorConfig(dataLocatorElement);
             }
-            
+
             // process MessageFormatters
-            OMElement messageFormattersElement = config_element.getFirstChildWithName(new QName(TAG_MESSAGE_FORMATTERS));
+            OMElement messageFormattersElement =
+                    config_element.getFirstChildWithName(new QName(TAG_MESSAGE_FORMATTERS));
             if (messageFormattersElement != null) {
                 HashMap messageFormatters = processMessageFormatters(messageFormattersElement);
                 Iterator keys = messageFormatters.keySet().iterator();
                 while (keys.hasNext()) {
                     String key = (String) keys.next();
-                    axisConfig.addMessageFormatter(key, (MessageFormatter) messageFormatters.get(key));
+                    axisConfig.addMessageFormatter(key,
+                                                   (MessageFormatter) messageFormatters.get(key));
                 }
             }
             //Processing deployers.
             Iterator deployerItr = config_element.getChildrenWithName(new QName(DEPLOYER));
-            if(deployerItr!=null){
+            if (deployerItr != null) {
                 processDeployers(deployerItr);
             }
         } catch (XMLStreamException e) {
@@ -211,7 +224,8 @@
             Iterator iterator = targetResolvers.getChildrenWithName(new QName(TAG_TARGET_RESOLVER));
             while (iterator.hasNext()) {
                 OMElement targetResolver = (OMElement) iterator.next();
-                OMAttribute classNameAttribute = targetResolver.getAttribute(new QName(TAG_CLASS_NAME));
+                OMAttribute classNameAttribute =
+                        targetResolver.getAttribute(new QName(TAG_CLASS_NAME));
                 String className = classNameAttribute.getAttributeValue();
                 try {
                     Class classInstance = Loader.loadClass(className);
@@ -219,7 +233,9 @@
                     axisConfig.addTargetResolver(tr);
                 } catch (Exception e) {
                     if (log.isTraceEnabled()) {
-                        log.trace("processTargetResolvers: Exception thrown initialising TargetResolver: " + e.getMessage());
+                        log.trace(
+                                "processTargetResolvers: Exception thrown initialising TargetResolver: " +
+                                        e.getMessage());
                     }
                 }
             }
@@ -232,9 +248,9 @@
         while (deployerItr.hasNext()) {
             OMElement element = (OMElement) deployerItr.next();
             String directory = element.getAttributeValue(new QName(DIRECTORY));
-            if(directory!=null){
+            if (directory != null) {
                 String extension = element.getAttributeValue(new QName(EXTENSION));
-                if(extension!=null){
+                if (extension != null) {
                     try {
                         String deployerValue = element.getAttributeValue(new QName(TAG_CLASS_NAME));
                         Class deployerClass;
@@ -244,7 +260,7 @@
                         deployer.setDirectory(directory);
                         deployer.setExtension(extension);
                         directoryToExtensionMappingMap.put(directory, extension);
-                        extensioToDeployerMappingMap.put(extension,deployer);
+                        extensioToDeployerMappingMap.put(extension, deployer);
                     } catch (ClassNotFoundException e) {
                         log.error(e);
                     } catch (InstantiationException e) {
@@ -255,7 +271,7 @@
                 }
             }
         }
-        if(deploymentEngine!=null){
+        if (deploymentEngine != null) {
             deploymentEngine.setDirectoryToExtensionMappingMap(directoryToExtensionMappingMap);
             deploymentEngine.setExtensioToDeployerMappingMap(extensioToDeployerMappingMap);
         }
@@ -316,11 +332,12 @@
 
                 Class observerclass;
                 try {
-                    observerclass = (Class) org.apache.axis2.java.security.AccessController.doPrivileged(new PrivilegedExceptionAction() {
-                        public Object run() throws ClassNotFoundException {
-                            return Loader.loadClass(clasName);
-                        }
-                    });
+                    observerclass = (Class) org.apache.axis2.java.security.AccessController
+                            .doPrivileged(new PrivilegedExceptionAction() {
+                                public Object run() throws ClassNotFoundException {
+                                    return Loader.loadClass(clasName);
+                                }
+                            });
                 } catch (PrivilegedActionException e) {
                     throw (ClassNotFoundException) e.getException();
                 }
@@ -410,7 +427,8 @@
         }
     }
 
-    private void processDefaultModuleVersions(OMElement defaultVersions) throws DeploymentException {
+    private void processDefaultModuleVersions(OMElement defaultVersions)
+            throws DeploymentException {
         Iterator moduleVersions = defaultVersions.getChildrenWithName(new QName(TAG_MODULE));
         while (moduleVersions.hasNext()) {
             OMElement omElement = (OMElement) moduleVersions.next();
@@ -418,7 +436,8 @@
             if (name == null) {
                 throw new DeploymentException(Messages.getMessage("modulenamecannotnull"));
             }
-            String defaultVeriosn = omElement.getAttributeValue(new QName(ATTRIBUTE_DEFAULT_VERSION));
+            String defaultVeriosn =
+                    omElement.getAttributeValue(new QName(ATTRIBUTE_DEFAULT_VERSION));
             if (defaultVeriosn == null) {
                 throw new DeploymentException(Messages.getMessage("modulenamecannotnull"));
             }
@@ -537,7 +556,7 @@
             String className = serviceOverallDataLocatorclass
                     .getAttributeValue();
             axisConfig.addDataLocatorClassNames(DRConstants.GLOBAL_LEVEL,
-                    className);
+                                                className);
         }
         Iterator iterator = dataLocatorElement.getChildrenWithName(new QName(
                 DRConstants.DIALECT_LOCATOR_ELEMENT));
@@ -549,12 +568,12 @@
             OMAttribute dialectclass = locatorElement.getAttribute(new QName(
                     DRConstants.CLASS_ATTRIBUTE));
             axisConfig.addDataLocatorClassNames(dialect.getAttributeValue(),
-                    dialectclass.getAttributeValue());
+                                                dialectclass.getAttributeValue());
 
         }
     }
-    
-    
+
+
     private Phase getPhase(String className)
             throws ClassNotFoundException, IllegalAccessException, InstantiationException {
         if (className == null) {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java Sun Mar  4 10:16:54 2007
@@ -49,7 +49,7 @@
      */
     public void buildCluster(OMElement clusterElement)
             throws DeploymentException {
-        
+
         String className = clusterElement.getAttribute(
                 new QName(TAG_CLASS_NAME)).getAttributeValue();
         ClusterManager clusterManager;
@@ -59,11 +59,11 @@
             axisConfig.setClusterManager(clusterManager);
             return;
         } catch (ClassNotFoundException e) {
-            throw new DeploymentException (Messages.getMessage("clusterImplNotFound"));
+            throw new DeploymentException(Messages.getMessage("clusterImplNotFound"));
         } catch (InstantiationException e) {
-            throw new DeploymentException (Messages.getMessage("cannotLoadClusterImpl"));
+            throw new DeploymentException(Messages.getMessage("cannotLoadClusterImpl"));
         } catch (IllegalAccessException e) {
-            throw new DeploymentException (e);
+            throw new DeploymentException(e);
         }
 
     }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/Deployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/Deployer.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/Deployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/Deployer.java Sun Mar  4 10:16:54 2007
@@ -20,6 +20,7 @@
 *
 *
 */
+
 /**
  * This interface is used to provide the custom deployment mechanism , where you
  * can write your owm Deployer to process a particular type and make that to
@@ -31,7 +32,10 @@
 
     //Will process the file and add that to axisConfig
     void deploy(DeploymentFileData deploymentFileData) throws DeploymentException;
+
     void setDirectory(String directory);
+
     void setExtension(String extension);
+
     void unDeploy(String fileName) throws DeploymentException;
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java Sun Mar  4 10:16:54 2007
@@ -41,8 +41,8 @@
     String TAG_PARAMETER = "parameter";
     String TAG_MAPPING = "mapping";
     String TAG_PACKAGE_NAME = "packageName";
-    String TAG_QNAME= "qName";
-    String TAG_PACKAGE2QNAME= "packageMapping";
+    String TAG_QNAME = "qName";
+    String TAG_PACKAGE2QNAME = "packageMapping";
     String TAG_MODULE = "module";
     String TAG_MODULE_CONFIG = "moduleConfig";
     String TAG_MESSAGE = "message";
@@ -69,11 +69,13 @@
     String TAG_TRANSPORT = "transport";
     String TAG_MEP = "mep";
     String TAG_DEFAULT_MODULE_VERSION = "defaultModuleVersions";
-    String TAG_CLUSTER = "cluster"; 
-    String TAG_MESSAGE_BUILDERS = "messageBuilders"; //used to add pluggable support for diffrent wire formats
+    String TAG_CLUSTER = "cluster";
+    String TAG_MESSAGE_BUILDERS =
+            "messageBuilders"; //used to add pluggable support for diffrent wire formats
     String TAG_MESSAGE_BUILDER = "messageBuilder";
     String TAG_CONTENT_TYPE = "contentType";
-    String TAG_MESSAGE_FORMATTERS = "messageFormatters"; //used to add pluggable support for diffrent wire formats
+    String TAG_MESSAGE_FORMATTERS =
+            "messageFormatters"; //used to add pluggable support for diffrent wire formats
     String TAG_MESSAGE_FORMATTER = "messageFormatter";
 
     String TAG_FLOW_IN = "InFlow";         // inflow start tag
@@ -95,8 +97,8 @@
     String TAG_NAMESPACES = "namespaces";
 
     //Deployer related cons
-    String DIRECTORY ="directory";
-    String EXTENSION ="extension";
+    String DIRECTORY = "directory";
+    String EXTENSION = "extension";
     String DEPLOYER = "deployer";
 
     // for parameters

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Sun Mar  4 10:16:54 2007
@@ -124,7 +124,8 @@
         // setting the CLs
         setClassLoaders(repoDir);
         repoListener = new RepositoryListener(this, false);
-        org.apache.axis2.util.Utils.calculateDefaultModuleVersion(axisConfig.getModules(), axisConfig);
+        org.apache.axis2.util.Utils
+                .calculateDefaultModuleVersion(axisConfig.getModules(), axisConfig);
         try {
             try {
                 axisConfig.setRepository(axisRepo.toURL());
@@ -147,7 +148,7 @@
             engageModules();
         } catch (AxisFault axisFault) {
             log.info(Messages.getMessage(DeploymentErrorMsgs.MODULE_VALIDATION_FAILED,
-                    axisFault.getMessage()));
+                                         axisFault.getMessage()));
             throw new DeploymentException(axisFault);
         }
     }
@@ -168,8 +169,9 @@
                     AxisServiceGroup serviceGroup = new AxisServiceGroup();
                     URL servicesURL = new URL(servicesDir, fileUrl);
                     ArrayList servicelist = populateService(serviceGroup,
-                            servicesURL,
-                            fileUrl.substring(0, fileUrl.indexOf(".aar")));
+                                                            servicesURL,
+                                                            fileUrl.substring(0, fileUrl.indexOf(
+                                                                    ".aar")));
                     addServiceGroup(serviceGroup, servicelist, servicesURL, null, axisConfig);
                 }
             }
@@ -248,7 +250,8 @@
             String metainf = "meta-inf";
             serviceGroup.setServiceGroupClassLoader(serviceClassLoader);
             //processing wsdl.list
-            InputStream wsdlfilesStream = serviceClassLoader.getResourceAsStream("meta-inf/wsdl.list");
+            InputStream wsdlfilesStream =
+                    serviceClassLoader.getResourceAsStream("meta-inf/wsdl.list");
             if (wsdlfilesStream == null) {
                 wsdlfilesStream = serviceClassLoader.getResourceAsStream("META-INF/wsdl.list");
                 if (wsdlfilesStream != null) {
@@ -275,7 +278,8 @@
                     }
                 }
             }
-            InputStream servicexmlStream = serviceClassLoader.getResourceAsStream("META-INF/services.xml");
+            InputStream servicexmlStream =
+                    serviceClassLoader.getResourceAsStream("META-INF/services.xml");
             if (servicexmlStream == null) {
                 servicexmlStream = serviceClassLoader.getResourceAsStream("meta-inf/services.xml");
             } else {
@@ -283,7 +287,8 @@
             }
             if (servicexmlStream == null) {
                 throw new DeploymentException(
-                        Messages.getMessage(DeploymentErrorMsgs.SERVICE_XML_NOT_FOUND, servicesURL.toString()));
+                        Messages.getMessage(DeploymentErrorMsgs.SERVICE_XML_NOT_FOUND,
+                                            servicesURL.toString()));
             }
             DescriptionBuilder builder = new DescriptionBuilder(servicexmlStream, configContext);
             OMElement rootElement = builder.buildOM();
@@ -291,9 +296,11 @@
 
             if (TAG_SERVICE.equals(elementName)) {
                 AxisService axisService = null;
-                InputStream wsdlStream = serviceClassLoader.getResourceAsStream(metainf + "/service.wsdl");
+                InputStream wsdlStream =
+                        serviceClassLoader.getResourceAsStream(metainf + "/service.wsdl");
                 if (wsdlStream == null) {
-                    wsdlStream = serviceClassLoader.getResourceAsStream(metainf + "/" + serviceName + ".wsdl");
+                    wsdlStream = serviceClassLoader
+                            .getResourceAsStream(metainf + "/" + serviceName + ".wsdl");
                 }
                 if (wsdlStream != null) {
                     WSDL11ToAxisServiceBuilder wsdl2AxisServiceBuilder =
@@ -318,14 +325,16 @@
                 return serviceList;
             } else if (TAG_SERVICE_GROUP.equals(elementName)) {
                 ServiceGroupBuilder groupBuilder = new ServiceGroupBuilder(rootElement, servicesMap,
-                        configContext);
+                                                                           configContext);
                 ArrayList servicList = groupBuilder.populateServiceGroup(serviceGroup);
                 Iterator serviceIterator = servicList.iterator();
                 while (serviceIterator.hasNext()) {
                     AxisService axisService = (AxisService) serviceIterator.next();
-                    InputStream wsdlStream = serviceClassLoader.getResourceAsStream(metainf + "/service.wsdl");
+                    InputStream wsdlStream =
+                            serviceClassLoader.getResourceAsStream(metainf + "/service.wsdl");
                     if (wsdlStream == null) {
-                        wsdlStream = serviceClassLoader.getResourceAsStream(metainf + "/" + serviceName + ".wsdl");
+                        wsdlStream = serviceClassLoader
+                                .getResourceAsStream(metainf + "/" + serviceName + ".wsdl");
                         if (wsdlStream != null) {
                             WSDL11ToAxisServiceBuilder wsdl2AxisServiceBuilder =
                                     new WSDL11ToAxisServiceBuilder(wsdlStream, axisService);
@@ -411,7 +420,7 @@
         axisConfiguration.addServiceGroup(serviceGroup);
         if (currentDeploymentFile != null) {
             addAsWebResources(currentDeploymentFile.getFile(),
-                    serviceGroup.getServiceGroupName(), serviceGroup);
+                              serviceGroup.getServiceGroupName(), serviceGroup);
         }
     }
 
@@ -455,7 +464,8 @@
                 if (module == null) {
                     throw new DeploymentException(
                             Messages.getMessage(
-                                    DeploymentErrorMsgs.BAD_MODULE_FROM_SERVICE, axisService.getName(),
+                                    DeploymentErrorMsgs.BAD_MODULE_FROM_SERVICE,
+                                    axisService.getName(),
                                     ((QName) list.get(i)).getLocalPart()));
                 }
 
@@ -476,7 +486,8 @@
                         throw new DeploymentException(
                                 Messages.getMessage(
                                         DeploymentErrorMsgs.BAD_MODULE_FROM_OPERATION,
-                                        opDesc.getName().getLocalPart(), moduleName.getLocalPart()));
+                                        opDesc.getName().getLocalPart(),
+                                        moduleName.getLocalPart()));
                     }
                 }
             }
@@ -506,7 +517,7 @@
                 if (zip.getName().toUpperCase().startsWith("WWW")) {
                     String fileName = zip.getName();
                     fileName = fileName.substring("WWW/".length(),
-                            fileName.length());
+                                                  fileName.length());
                     if (zip.isDirectory()) {
                         new File(out, fileName).mkdirs();
                     } else {
@@ -542,13 +553,13 @@
         wsToUnDeploy.add(file);
     }
 
-    public void doDeploy() throws DeploymentException{
+    public void doDeploy() throws DeploymentException {
         if (wsToDeploy.size() > 0) {
             for (int i = 0; i < wsToDeploy.size(); i++) {
                 DeploymentFileData currentDeploymentFile = (DeploymentFileData) wsToDeploy.get(i);
                 String type = currentDeploymentFile.getType();
                 if (TYPE_SERVICE.equals(type)) {
-                	
+
                     serviceDeployer.deploy(currentDeploymentFile);
                 } else if (TYPE_MODULE.equals(type)) {
                     moduleDeployer.deploy(currentDeploymentFile);
@@ -635,7 +646,8 @@
                         }
                     } else {
                         if (isHotUpdate()) {
-                            Deployer deployer = (Deployer) extensioToDeployerMappingMap.get(fileType);
+                            Deployer deployer =
+                                    (Deployer) extensioToDeployerMappingMap.get(fileType);
                             if (deployer != null) {
                                 deployer.unDeploy(wsInfo.getFileName());
                             }
@@ -725,7 +737,7 @@
 
         if (modulesDir.exists()) {
             axisConfig.setModuleClassLoader(Utils.getClassLoader(axisConfig.getSystemClassLoader(),
-                    modulesDir));
+                                                                 modulesDir));
         } else {
             axisConfig.setModuleClassLoader(axisConfig.getSystemClassLoader());
         }
@@ -889,14 +901,15 @@
         AxisModule axismodule;
         try {
             DeploymentFileData currentDeploymentFile = new DeploymentFileData(modulearchive,
-                    DeploymentConstants.TYPE_MODULE, false);
+                                                                              DeploymentConstants.TYPE_MODULE,
+                                                                              false);
             axismodule = new AxisModule();
             ArchiveReader archiveReader = new ArchiveReader();
 
             currentDeploymentFile.setClassLoader(false, config.getModuleClassLoader());
             axismodule.setModuleClassLoader(currentDeploymentFile.getClassLoader());
             archiveReader.readModuleArchive(currentDeploymentFile, axismodule,
-                    false, config);
+                                            false, config);
             ClassLoader moduleClassLoader = axismodule.getModuleClassLoader();
             Flow inflow = axismodule.getInFlow();
 
@@ -960,7 +973,7 @@
             currentDeploymentFile.setClassLoader(classLoader);
 
             ServiceBuilder builder = new ServiceBuilder(serviceInputStream, configCtx,
-                    axisService);
+                                                        axisService);
 
             builder.populateService(builder.buildOM());
         } catch (AxisFault axisFault) {
@@ -996,8 +1009,9 @@
         AxisConfiguration axisConfig = configCtx.getAxisConfiguration();
         try {
             ArrayList serviceList = archiveReader.buildServiceGroup(servicesxml,
-                    currentDeploymentFile, serviceGroup,
-                    wsdlServices, configCtx);
+                                                                    currentDeploymentFile,
+                                                                    serviceGroup,
+                                                                    wsdlServices, configCtx);
             fillServiceGroup(serviceGroup, serviceList, null, axisConfig);
             return serviceGroup;
         } catch (XMLStreamException e) {
@@ -1031,7 +1045,7 @@
         return directoryToExtensionMappingMap;
     }
 
-	public RepositoryListener getRepoListener() {
-		return repoListener;
-	}
+    public RepositoryListener getRepoListener() {
+        return repoListener;
+    }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Sun Mar  4 10:16:54 2007
@@ -21,8 +21,6 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.builder.Builder;
-import org.apache.axis2.builder.MIMEBuilder;
-import org.apache.axis2.builder.SOAPBuilder;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
@@ -106,7 +104,7 @@
      * @param service :
      *                This can be null <code>AxisService</code>
      */
-    protected MessageReceiver loadDefaultMessageReceiver(String mepURL,                                                        AxisService service) {
+    protected MessageReceiver loadDefaultMessageReceiver(String mepURL, AxisService service) {
         MessageReceiver messageReceiver;
         if (mepURL == null) {
             mepURL = WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT;
@@ -135,15 +133,19 @@
             OMElement msgReceiver = (OMElement) msgReceivers.next();
             final OMElement tempMsgReceiver = msgReceiver;
             MessageReceiver receiver = null;
-            try { 
-              receiver = (MessageReceiver) org.apache.axis2.java.security.AccessController.doPrivileged(new PrivilegedExceptionAction() {
-                public Object run() throws org.apache.axis2.deployment.DeploymentException {
-                  return loadMessageReceiver(Thread.currentThread().getContextClassLoader(), tempMsgReceiver);
-                }
-              });
+            try {
+                receiver = (MessageReceiver) org.apache.axis2.java.security.AccessController
+                        .doPrivileged(new PrivilegedExceptionAction() {
+                            public Object run()
+                                    throws org.apache.axis2.deployment.DeploymentException {
+                                return loadMessageReceiver(
+                                        Thread.currentThread().getContextClassLoader(),
+                                        tempMsgReceiver);
+                            }
+                        });
             } catch (PrivilegedActionException e) {
-              throw (DeploymentException)e.getException();
-            }              
+                throw (DeploymentException) e.getException();
+            }
             OMAttribute mepAtt = msgReceiver.getAttribute(new QName(TAG_MEP));
             mr_mep.put(mepAtt.getAttributeValue(), receiver);
         }
@@ -164,7 +166,7 @@
         while (iterator.hasNext()) {
             OMElement receiverElement = (OMElement) iterator.next();
             MessageReceiver receiver = loadMessageReceiver(loader,
-                    receiverElement);
+                                                           receiverElement);
             OMAttribute mepAtt = receiverElement
                     .getAttribute(new QName(TAG_MEP));
             meps.put(mepAtt.getAttributeValue(), receiver);
@@ -202,17 +204,17 @@
 
         return receiver;
     }
-    
+
     /**
      * Processes the message builders specified in axis2.xml or services.xml.
-     * 
+     *
      * @param messageBuildersElement
      */
     protected HashMap processMessageBuilders(OMElement messageBuildersElement)
-    throws DeploymentException {
+            throws DeploymentException {
         HashMap builderSelector = new HashMap();
         Iterator msgBuilders = messageBuildersElement
-        .getChildrenWithName(new QName(TAG_MESSAGE_BUILDER));
+                .getChildrenWithName(new QName(TAG_MESSAGE_BUILDER));
         while (msgBuilders.hasNext()) {
             OMElement msgBuilderElement = (OMElement) msgBuilders.next();
             OMElement tempMsgBuilder = msgBuilderElement;
@@ -222,37 +224,36 @@
             Builder builderObject;
             try {
                 builderClass = findAndValidateSelectorClass(className,
-                        DeploymentErrorMsgs.ERROR_LOADING_MESSAGE_BUILDER);
-                builderObject = (Builder)builderClass.newInstance();
+                                                            DeploymentErrorMsgs.ERROR_LOADING_MESSAGE_BUILDER);
+                builderObject = (Builder) builderClass.newInstance();
             } catch (PrivilegedActionException e) {
                 throw (DeploymentException) e.getException();
             } catch (InstantiationException e) {
                 throw new DeploymentException(
                         "Cannot instantiate the specified Builder Class  : "
-                        + builderClass.getName() + ".", e);
+                                + builderClass.getName() + ".", e);
             } catch (IllegalAccessException e) {
                 throw new DeploymentException(
                         "Cannot instantiate the specified Builder Class : "
-                        + builderClass.getName() + ".", e);
+                                + builderClass.getName() + ".", e);
             }
             OMAttribute contentTypeAtt = msgBuilderElement
-            .getAttribute(new QName(TAG_CONTENT_TYPE));
+                    .getAttribute(new QName(TAG_CONTENT_TYPE));
             builderSelector.put(contentTypeAtt.getAttributeValue(),
-                    builderObject);
-        }		
+                                builderObject);
+        }
         return builderSelector;
     }
-    
-    
+
+
     /**
      * Processes the message builders specified in axis2.xml or services.xml.
-     * 
      */
     protected HashMap processMessageFormatters(OMElement messageFormattersElement)
-    throws DeploymentException {
+            throws DeploymentException {
         HashMap messageFormatters = new HashMap();
         Iterator msgFormatters = messageFormattersElement
-        .getChildrenWithName(new QName(TAG_MESSAGE_FORMATTER));
+                .getChildrenWithName(new QName(TAG_MESSAGE_FORMATTER));
         while (msgFormatters.hasNext()) {
             OMElement msgFormatterElement = (OMElement) msgFormatters.next();
             OMElement tempMsgFormatter = msgFormatterElement;
@@ -261,55 +262,57 @@
             MessageFormatter formatterObject;
             Class formatterClass = null;
             try {
-                formatterClass = findAndValidateSelectorClass(className,DeploymentErrorMsgs.ERROR_LOADING_MESSAGE_FORMATTER );
-                formatterObject = (MessageFormatter)formatterClass.newInstance();
+                formatterClass = findAndValidateSelectorClass(className,
+                                                              DeploymentErrorMsgs.ERROR_LOADING_MESSAGE_FORMATTER);
+                formatterObject = (MessageFormatter) formatterClass.newInstance();
             } catch (PrivilegedActionException e) {
                 throw (DeploymentException) e.getException();
             } catch (InstantiationException e) {
                 throw new DeploymentException(
                         "Cannot instantiate the specified Formatter Class  : "
-                        + formatterClass.getName() + ".", e);
+                                + formatterClass.getName() + ".", e);
             } catch (IllegalAccessException e) {
                 throw new DeploymentException(
                         "Cannot instantiate the specified Formatter Class : "
-                        + formatterClass.getName() + ".", e);
+                                + formatterClass.getName() + ".", e);
             }
             OMAttribute contentTypeAtt = msgFormatterElement
-            .getAttribute(new QName(TAG_CONTENT_TYPE));
+                    .getAttribute(new QName(TAG_CONTENT_TYPE));
             messageFormatters.put(contentTypeAtt.getAttributeValue(),
-                    formatterObject);
+                                  formatterObject);
         }
         return messageFormatters;
     }
-    
+
     protected Class findAndValidateSelectorClass(final String className, final String errorMsg)
-    throws PrivilegedActionException {
+            throws PrivilegedActionException {
         return (Class) org.apache.axis2.java.security.AccessController
-        .doPrivileged(new PrivilegedExceptionAction() {
-            public Object run()
-            throws org.apache.axis2.deployment.DeploymentException {
-                Class selectorClass;
-                try {
-                    if ((className != null) && !"".equals(className)) {
-                        selectorClass = Loader.loadClass(Thread.currentThread()
-                                .getContextClassLoader(), className);
-                    }else
-                    {
-                        throw new DeploymentException(Messages.getMessage(errorMsg,
-                                "Invalid Class Name",className));
+                .doPrivileged(new PrivilegedExceptionAction() {
+                    public Object run()
+                            throws org.apache.axis2.deployment.DeploymentException {
+                        Class selectorClass;
+                        try {
+                            if ((className != null) && !"".equals(className)) {
+                                selectorClass = Loader.loadClass(Thread.currentThread()
+                                        .getContextClassLoader(), className);
+                            } else {
+                                throw new DeploymentException(Messages.getMessage(errorMsg,
+                                                                                  "Invalid Class Name",
+                                                                                  className));
+                            }
+                        } catch (ClassNotFoundException e) {
+                            throw new DeploymentException(Messages.getMessage(errorMsg,
+                                                                              "ClassNotFoundException",
+                                                                              className), e);
+                        }
+                        return selectorClass;
                     }
-                } catch (ClassNotFoundException e) {
-                    throw new DeploymentException(Messages.getMessage(errorMsg,
-                            "ClassNotFoundException",className), e);
-                }
-                return selectorClass;
-            }
-        });
+                });
     }
 
     /**
      * Processes flow elements in services.xml .
-     * 
+     *
      * @param flowelement <code>OMElement</code>
      * @return Returns Flow.
      * @throws DeploymentException <code>DeploymentException</code>
@@ -376,7 +379,8 @@
      * @throws DeploymentException <code>DeploymentException</code>
      */
     protected HandlerDescription processHandler(OMElement handler_element,
-                                                ParameterInclude parent) throws DeploymentException {
+                                                ParameterInclude parent)
+            throws DeploymentException {
         HandlerDescription handler = new HandlerDescription();
 
         // Setting handler name
@@ -622,7 +626,8 @@
     }
 
     protected void processPolicyRefElements(int type,
-                                            Iterator policyRefElements, PolicyInclude policyInclude) {
+                                            Iterator policyRefElements,
+                                            PolicyInclude policyInclude) {
 
         while (policyRefElements.hasNext()) {
             PolicyReference policyReference = PolicyEngine

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java Sun Mar  4 10:16:54 2007
@@ -77,7 +77,8 @@
                 File configFile = new File(axis2xml);
                 if (!configFile.exists()) {
                     log.info("Error in file (axis2.xml) creation inside FileSystemConfigurator");
-                    throw new AxisFault("Error in file (axis2.xml) creation inside FileSystemConfigurator");
+                    throw new AxisFault(
+                            "Error in file (axis2.xml) creation inside FileSystemConfigurator");
                 }
             }
         }
@@ -98,7 +99,8 @@
                 axis2xmlSream = new FileInputStream(axis2xml);
             } else {
                 ClassLoader cl = Thread.currentThread().getContextClassLoader();
-                axis2xmlSream = cl.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
+                axis2xmlSream =
+                        cl.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
             }
             axisConfig = populateAxisConfiguration(axis2xmlSream);
         } catch (FileNotFoundException e) {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Sun Mar  4 10:16:54 2007
@@ -64,16 +64,16 @@
                 final Class fmoduleClass = moduleClass;
                 final AxisModule fmodule = module;
                 try {
-                    AccessController.doPrivileged( new PrivilegedExceptionAction() {
+                    AccessController.doPrivileged(new PrivilegedExceptionAction() {
                         public Object run() throws IllegalAccessException, InstantiationException {
                             Module new_module = (Module) fmoduleClass.newInstance();
                             fmodule.setModule(new_module);
                             return null;
                         }
-                    });      
+                    });
                 } catch (PrivilegedActionException e) {
                     throw e.getException();
-                }   
+                }
             }
         } catch (Exception e) {
             throw new DeploymentException(e.getMessage(), e);
@@ -118,17 +118,21 @@
             // setting the PolicyInclude
 
             // processing <wsp:Policy> .. </..> elements
-            Iterator policyElements = moduleElement.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY));
+            Iterator policyElements =
+                    moduleElement.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY));
 
             if (policyElements != null && policyElements.hasNext()) {
-                processPolicyElements(PolicyInclude.AXIS_MODULE_POLICY, policyElements, module.getPolicyInclude());
+                processPolicyElements(PolicyInclude.AXIS_MODULE_POLICY, policyElements,
+                                      module.getPolicyInclude());
             }
 
             // processing <wsp:PolicyReference> .. </..> elements
-            Iterator policyRefElements = moduleElement.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY_REF));
+            Iterator policyRefElements =
+                    moduleElement.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY_REF));
 
             if (policyRefElements != null && policyElements.hasNext()) {
-                processPolicyRefElements(PolicyInclude.AXIS_MODULE_POLICY, policyRefElements, module.getPolicyInclude());
+                processPolicyRefElements(PolicyInclude.AXIS_MODULE_POLICY, policyRefElements,
+                                         module.getPolicyInclude());
             }
 
             // processing Parameters
@@ -150,35 +154,39 @@
                 module.setOutFlow(processFlow(outFlow, module));
             }
 
-            OMElement inFaultFlow = moduleElement.getFirstChildWithName(new QName(TAG_FLOW_IN_FAULT));
+            OMElement inFaultFlow =
+                    moduleElement.getFirstChildWithName(new QName(TAG_FLOW_IN_FAULT));
 
             if (inFaultFlow != null) {
                 module.setFaultInFlow(processFlow(inFaultFlow, module));
             }
 
-            OMElement outFaultFlow = moduleElement.getFirstChildWithName(new QName(TAG_FLOW_OUT_FAULT));
+            OMElement outFaultFlow =
+                    moduleElement.getFirstChildWithName(new QName(TAG_FLOW_OUT_FAULT));
 
             if (outFaultFlow != null) {
                 module.setFaultOutFlow(processFlow(outFaultFlow, module));
             }
 
-            OMElement supportedPolicyNamespaces = moduleElement.getFirstChildWithName(new QName(TAG_SUPPORTED_POLICY_NAMESPACES));
+            OMElement supportedPolicyNamespaces =
+                    moduleElement.getFirstChildWithName(new QName(TAG_SUPPORTED_POLICY_NAMESPACES));
 
             if (supportedPolicyNamespaces != null) {
-                module.setSupportedPolicyNamespaces(processSupportedPolicyNamespaces(supportedPolicyNamespaces));
+                module.setSupportedPolicyNamespaces(
+                        processSupportedPolicyNamespaces(supportedPolicyNamespaces));
             }
-            
-            
+
             /*
-             * Module description should contain a list of QName of the assertions that are local to the system.
-             * These assertions are not exposed to the outside.
-             */
-            OMElement localPolicyAssertionElement = moduleElement.getFirstChildWithName(new QName("local-policy-assertions"));
-            
+            * Module description should contain a list of QName of the assertions that are local to the system.
+            * These assertions are not exposed to the outside.
+            */
+            OMElement localPolicyAssertionElement =
+                    moduleElement.getFirstChildWithName(new QName("local-policy-assertions"));
+
             if (localPolicyAssertionElement != null) {
-                module.setLocalPolicyAssertions(getLocalPolicyAssertionNames(localPolicyAssertionElement));
+                module.setLocalPolicyAssertions(
+                        getLocalPolicyAssertionNames(localPolicyAssertionElement));
             }
-            
 
             // processing Operations
             Iterator op_itr = moduleElement.getChildrenWithName(new QName(TAG_OPERATION));
@@ -244,10 +252,11 @@
 
             //To process wsamapping;
             processActionMappings(operation, op_descrip);
-            
+
             // setting the MEP of the operation
             // loading the message receivers
-            OMElement receiverElement = operation.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVER));
+            OMElement receiverElement =
+                    operation.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVER));
 
             if (receiverElement != null) {
                 MessageReceiver messageReceiver =



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