axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r357657 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: deployment/ deployment/listener/ deployment/repository/util/ description/
Date Mon, 19 Dec 2005 07:15:21 GMT
Author: dims
Date: Sun Dec 18 23:15:08 2005
New Revision: 357657

URL: http://svn.apache.org/viewcvs?rev=357657&view=rev
Log:
fix javadocs, constants, spelling, minor gc

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentErrorMsgs.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
Sun Dec 18 23:15:08 2005
@@ -47,9 +47,9 @@
     private AxisConfiguration axisConfiguration;
     private DeploymentEngine engine;
 
-    public AxisConfigBuilder(InputStream serviceInputSteram, DeploymentEngine engine,
+    public AxisConfigBuilder(InputStream serviceInputStream, DeploymentEngine engine,
                              AxisConfiguration axisConfiguration) {
-        super(serviceInputSteram, axisConfiguration);
+        super(serviceInputStream, axisConfiguration);
         this.axisConfiguration = axisConfiguration;
         this.engine = engine;
     }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
Sun Dec 18 23:15:08 2005
@@ -70,4 +70,23 @@
     // for parameters
     String ATTRIBUTE_NAME = "name";
     String ATTRIBUTE_LOCKED = "locked";
+    String PROPERTY_USER_HOME = "user.home";
+    String DIRECTORY_MODULES = "modules";
+    String DIRECTORY_AXIS2_HOME = ".axis2home";
+    String RESOURCE_MODULES = "modules/";
+    String SUFFIX_MAR = ".mar";
+    String SUFFIX_JAR = ".jar";
+    String SUFFIX_WSDL = ".wsdl";
+    /**
+     * Resource that contains the configuration
+     */
+    String AXIS2_CONFIGURATION_RESOURCE =
+            "org/apache/axis2/deployment/axis2.xml";
+    String SERVER_XML_FILE = "axis2.xml";
+    String DIRECTORY_SERVICES = "services";
+    String DEFAULT_MESSAGE_RECEIVER = "org.apache.axis2.receivers.RawXMLINOutMessageReceiver";
+    String BOOLEAN_TRUE = "true";
+    String BOOLEAN_FALSE = "false";
+    char SEPARATOR_DOT = '.';
+    char SEPARATOR_COLON = ':';
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
Sun Dec 18 23:15:08 2005
@@ -59,12 +59,6 @@
 
 public class DeploymentEngine implements DeploymentConstants {
 
-    /**
-     * Resource that contains the configuration
-     */
-    protected static final String AXIS2_CONFIGURATION_RESOURCE =
-            "org/apache/axis2/deployment/axis2.xml";
-    protected static final String SERVER_XML_FILE = "axis2.xml";
     private Log log = LogFactory.getLog(getClass());
     private boolean hotUpdate = true;    // to do hot update or not
     private boolean hotDeployment = true;    // to do hot deployment or not
@@ -122,7 +116,7 @@
             throws DeploymentException {
         if ((repositoryName == null) || repositoryName.trim().equals("")) {
             throw new DeploymentException(
-                    Messages.getMessage(DeploymentErrorMsgs.REPO_CAN_NOT_BE_NULL));
+                    Messages.getMessage(DeploymentErrorMsgs.REPOSITORY_CANNOT_BE_NULL));
         }
 
         this.folderName = repositoryName;
@@ -132,8 +126,8 @@
         if (!repository.exists()) {
             repository.mkdirs();
 
-            File services = new File(repository, "services");
-            File modules = new File(repository, "modules");
+            File services = new File(repository, DIRECTORY_SERVICES);
+            File modules = new File(repository, DIRECTORY_MODULES);
 
             modules.mkdirs();
             services.mkdirs();
@@ -379,27 +373,6 @@
         return axismodule;
     }
 
-    /*
-     *  public AxisService deployService(ClassLoader classLoder, InputStream serviceStream,
String servieName) throws DeploymentException {
-     * AxisService service = null;
-     * try {
-     * currentArchiveFileile = new ArchiveFileData(SERVICE, servieName);
-     * currentArchiveFileile.setClassLoader(classLoder);
-     * service = new AxisService();
-     * DeploymentParser schme = new DeploymentParser(serviceStream, this);
-     * schme.parseServiceXML(service);
-     * service = loadServiceProperties(service);
-     * } catch (XMLStreamException e) {
-     * throw  new DeploymentException(e.getMessage());
-     * } catch (PhaseException e) {
-     * throw  new DeploymentException(e.getMessage());
-     * } catch (AxisFault axisFault) {
-     * throw  new DeploymentException(axisFault.getMessage());
-     * }
-     * return service;
-     * }
-     */
-
     /**
      * This method is used to fill a axisservice object using services.xml , first it should
create
      * an axisservice object using WSDL and then fill that using given servic.xml and load
all the requed
@@ -441,8 +414,8 @@
         if (!repository.exists()) {
             repository.mkdirs();
 
-            File services = new File(repository, "services");
-            File modules = new File(repository, "modules");
+            File services = new File(repository, DIRECTORY_SERVICES);
+            File modules = new File(repository, DIRECTORY_MODULES);
 
             modules.mkdirs();
             services.mkdirs();
@@ -609,7 +582,7 @@
                             break;
                     }
                 } catch (AxisFault axisFault) {
-                    log.info(Messages.getMessage(DeploymentErrorMsgs.SETTING_CL,
+                    log.info(Messages.getMessage(DeploymentErrorMsgs.ERROR_SETTING_CLIENT_HOME,
                             axisFault.getMessage()));
                 }
             }
@@ -633,7 +606,7 @@
     public AxisConfiguration load() throws DeploymentException {
         if (engineConfigName == null) {
             throw new DeploymentException(
-                    Messages.getMessage(DeploymentErrorMsgs.PATH_TO_CONFIG_CAN_NOT_B_NULL));
+                    Messages.getMessage(DeploymentErrorMsgs.PATH_TO_CONFIG_CANNOT_BE_NULL));
         }
 
         File tempfile = new File(engineConfigName);
@@ -663,7 +636,7 @@
             validateSystemPredefinedPhases();
             engageModules();
         } catch (AxisFault axisFault) {
-            log.info(Messages.getMessage(DeploymentErrorMsgs.MODULE_VAL_FAILED,
+            log.info(Messages.getMessage(DeploymentErrorMsgs.MODULE_VALIDATION_FAILED,
                     axisFault.getMessage()));
 
             throw new DeploymentException(axisFault);
@@ -729,7 +702,7 @@
             validateSystemPredefinedPhases();
             engageModules();
         } catch (AxisFault axisFault) {
-            log.info(Messages.getMessage(DeploymentErrorMsgs.MODULE_VAL_FAILED,
+            log.info(Messages.getMessage(DeploymentErrorMsgs.MODULE_VALIDATION_FAILED,
                     axisFault.getMessage()));
 
             throw new DeploymentException(axisFault);
@@ -879,7 +852,7 @@
 
         axisConfig.setSystemClassLoader(sysClassLoader);
 
-        File services = new File(axis2repo, "services");
+        File services = new File(axis2repo, DIRECTORY_SERVICES);
 
         if (services.exists()) {
             axisConfig.setServiceClassLoader(
@@ -888,7 +861,7 @@
             axisConfig.setServiceClassLoader(axisConfig.getSystemClassLoader());
         }
 
-        File modules = new File(axis2repo, "modules");
+        File modules = new File(axis2repo, DIRECTORY_MODULES);
 
         if (modules.exists()) {
             axisConfig.setModuleClassLoader(Utils.getClassLoader(axisConfig.getSystemClassLoader(),

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentErrorMsgs.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentErrorMsgs.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentErrorMsgs.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentErrorMsgs.java
Sun Dec 18 23:15:08 2005
@@ -19,27 +19,19 @@
 
 public class DeploymentErrorMsgs {
     public static final String ADDING_NEW_MODULE = "addingnewmodule";
-    public static final String BAD_ARGU_4_SERVICE = "badarguforservice";
-    public static final String BAD_LIST_ARGU = "badlistagu";
     public static final String BAD_MODULE_FROM_OPERATION = "badModuleFromOperation";
     public static final String BAD_MODULE_FROM_SERVICE = "badModuleFromService";
-    public static final String BAD_OP_ATTRIBUTE = "badopattribute";
-    public static final String BAD_PARA_ARGU = "badparaagu";
-    public static final String BEAN_MAPPING_NOT_IMPLEMENTED = "beanmappingnotimpl";
+    public static final String BAD_PARAMETER_ARGUMENT = "badparaagu";
     public static final String CONFIG_NOT_FOUND = "confignotfound";
     public static final String CLASS_NOT_FOUND = "classnotfound";
     public static final String DEPLOYING_MODULE = "deployeingmodule";
     public static final String DEPLOYING_WS = "deployingws";
     public static final String ELEMENT_IS_NOT_ALLOWED = "elementisnotallow";
-    public static final String ERROR_IN_LOADING_MR = "errorinloadingmr";
-    public static final String FLOWTYPE_IS_REQD = "flowtypeisrequird";
+    public static final String ERROR_IN_LOADING_MESSAGE_RECEIVER = "errorinloadingmr";
+    public static final String FLOWTYPE_IS_REQUIRED = "flowtypeisrequird";
     public static final String FILE_NOT_FOUND = "fileNotFound";
-    public static final String ILLEGAL_ACCESS = "IllegalAccessException";
     public static final String INFLOW_NOT_ALLOWED_IN_TRS_OUT = "inflownotallowedintrout";
-    public static final String INSTANTIATION_EXCEPTION = "InstantiationException";
-    public static final String INVALID_CONFIG_ATTTRIBUTE = "invalidconfigattribute";
     public static final String INVALID_HANDLER = "invalidhandler";
-    public static final String INVALID_HANDLER_DIF = "invalidhandlerdif";
     public static final String INVALID_MODULE = "invalidmodule";
     public static final String INVALID_MODULE_CONFIG = "invalidmoduleconfig";
     public static final String INVALID_MODULE_REF = "invalidmodulerefbyconfig";
@@ -47,35 +39,25 @@
     public static final String INVALID_PHASE = "invalidphase";
     public static final String INVALID_SERVICE = "invalidservice";
     public static final String INVALID_STORAGE_CLASS = "invalid_storage";
-    public static final String MODULE_CANNOTHAVE_BOTH_NAME_AND_REF =
+    public static final String MODULE_CANNOT_HAVE_BOTH_NAME_AND_REFERENCE =
             "modulecannothavrbothnameandref";
     public static final String MODULE_NOT_FOUND = "modulenotfound";
-    public static final String MODULE_VAL_FAILED = "modulevalfailed";
-    public static final String MODULEXML_NOT_FOUND_FOR_THE_MODULE = "modulexmlnotfound";
-    public static final String NO_DISPATCHER_FOUND = "no_dispatcher_found";
-    public static final String NO_META_INF = "noMetaInf";
+    public static final String MODULE_VALIDATION_FAILED = "modulevalfailed";
+    public static final String MODULE_XML_MISSING = "modulexmlnotfound";
+    public static final String META_INF_MISSING = "noMetaInf";
     public static final String OBSERVER_ERROR = "obsererror";
-    public static final String OP_NOT_FOUN_IN_WSDL = "opnotfoundinwsdl";
     public static final String OPERATION_PROCESS_ERROR = "op_error";
     public static final String OUTFLOW_NOT_ALLOWED_IN_TRS_IN =
             "outflownotallowedintrin";
     public static final String PARAMETER_LOCKED = "parameterlockederror";
-    public static final String PATH_TO_CONFIG_CAN_NOT_B_NULL = "pathtoconfigcanotnull";
-    public static final String PHASE_DOES_NOT_SPECIFED = "phasedosenotspecified";
-    public static final String REPO_CAN_NOT_BE_NULL = "repocannotbebull";
-    public static final String SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE =
+    public static final String PATH_TO_CONFIG_CANNOT_BE_NULL = "pathtoconfigcanotnull";
+    public static final String REPOSITORY_CANNOT_BE_NULL = "repocannotbebull";
+    public static final String SERVICE_MODULE_CANNOT_REFER_GLOBAL_PHASE =
             "servicemodulecannothaveglobal";
     public static final String SERVICE_NAME_ERROR = "servicenameeror";
     public static final String SERVICE_REMOVED = "serviceremoved";
     public static final String SERVICE_XML_NOT_FOUND = "servicexmlnotfound";
-    public static final String SETTING_CL = "settingcl";
-    public static final String THIS_SHOULD_BE_IMPLEMENTED = "thisshouldbeimplment";
+    public static final String ERROR_SETTING_CLIENT_HOME = "settingcl";
     public static final String TRANSPORT_SENDER_ERROR = "transportSenderError";
-    public static final String TYPE_MAPPING_NOT_ALLOWED = "typemappingnotallowed";
-    public static final String TYPE_MAPPING_NOT_IMPLEMENTED = "typemappingnotimpl";
-    public static final String UNDEFINED_FLOW_TYPE = "undefinedFlowType";
-    public static final String UNKNOWN_ELEMENT = "unknownelement";
-    public static final String UNKNOWN_IN_OPERATION = "unknownelementinop";
-    public static final String WSDL_FILE_NOT_FOUND = "wsdlfilenotfound";
-    public static final String XTZX_EXCEPTION = "StreamException";
+    public static final String XML_STREAM_EXCEPTION = "StreamException";
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
Sun Dec 18 23:15:08 2005
@@ -52,13 +52,13 @@
     protected Log log = LogFactory.getLog(getClass());
     protected AxisConfiguration axisConfig;
 
-    protected InputStream des_inputStream;
+    protected InputStream descriptionStream;
 
     public DescriptionBuilder() {
     }
 
     public DescriptionBuilder(InputStream serviceInputStream, AxisConfiguration axisConfig)
{
-        this.des_inputStream = serviceInputStream;
+        this.descriptionStream = serviceInputStream;
         this.axisConfig = axisConfig;
     }
 
@@ -72,7 +72,7 @@
      */
     public OMElement buildOM() throws XMLStreamException {
         XMLStreamReader xmlReader =
-                XMLInputFactory.newInstance().createXMLStreamReader(des_inputStream);
+                XMLInputFactory.newInstance().createXMLStreamReader(descriptionStream);
         OMFactory fac = OMAbstractFactory.getOMFactory();
         StAXOMBuilder staxOMBuilder = new StAXOMBuilder(fac, xmlReader);
         OMElement element = staxOMBuilder.getDocumentElement();
@@ -84,8 +84,7 @@
 
     protected MessageReceiver loadDefaultMessageReceiver() throws DeploymentException {
         MessageReceiver receiver;
-        String defaultMessageReceiver =
-                "org.apache.axis2.receivers.RawXMLINOutMessageReceiver";
+        String defaultMessageReceiver = DEFAULT_MESSAGE_RECEIVER;
 
         try {
 
@@ -99,17 +98,17 @@
         } catch (ClassNotFoundException e) {
             throw new DeploymentException(
                     Messages.getMessage(
-                            DeploymentErrorMsgs.ERROR_IN_LOADING_MR, "ClassNotFoundException",
+                            DeploymentErrorMsgs.ERROR_IN_LOADING_MESSAGE_RECEIVER, "ClassNotFoundException",
                             defaultMessageReceiver));
         } catch (IllegalAccessException e) {
             throw new DeploymentException(
                     Messages.getMessage(
-                            DeploymentErrorMsgs.ERROR_IN_LOADING_MR, "IllegalAccessException",
+                            DeploymentErrorMsgs.ERROR_IN_LOADING_MESSAGE_RECEIVER, "IllegalAccessException",
                             defaultMessageReceiver));
         } catch (InstantiationException e) {
             throw new DeploymentException(
                     Messages.getMessage(
-                            DeploymentErrorMsgs.ERROR_IN_LOADING_MR, "InstantiationException",
+                            DeploymentErrorMsgs.ERROR_IN_LOADING_MESSAGE_RECEIVER, "InstantiationException",
                             defaultMessageReceiver));
         }
 
@@ -132,15 +131,15 @@
         } catch (ClassNotFoundException e) {
             throw new DeploymentException(
                     Messages.getMessage(
-                            DeploymentErrorMsgs.ERROR_IN_LOADING_MR, "ClassNotFoundException",
className));
+                            DeploymentErrorMsgs.ERROR_IN_LOADING_MESSAGE_RECEIVER, "ClassNotFoundException",
className));
         } catch (IllegalAccessException e) {
             throw new DeploymentException(
                     Messages.getMessage(
-                            DeploymentErrorMsgs.ERROR_IN_LOADING_MR, "IllegalAccessException",
className));
+                            DeploymentErrorMsgs.ERROR_IN_LOADING_MESSAGE_RECEIVER, "IllegalAccessException",
className));
         } catch (InstantiationException e) {
             throw new DeploymentException(
                     Messages.getMessage(
-                            DeploymentErrorMsgs.ERROR_IN_LOADING_MR, "InstantiationException",
className));
+                            DeploymentErrorMsgs.ERROR_IN_LOADING_MESSAGE_RECEIVER, "InstantiationException",
className));
         }
 
         return receiver;
@@ -198,7 +197,7 @@
 
         if (class_attribute == null) {
             throw new DeploymentException((Messages.getMessage(DeploymentErrorMsgs.INVALID_HANDLER,
-                    "class name missing")));
+                    "class name is missing")));
         } else {
             handler.setClassName(class_attribute.getAttributeValue());
         }
@@ -208,7 +207,7 @@
 
         if (order_element == null) {
             throw new DeploymentException((Messages.getMessage(DeploymentErrorMsgs.INVALID_HANDLER,
-                    "phase rule does not specify")));
+                    "phase rule has not been specified")));
         } else {
             Iterator order_itr = order_element.getAllAttributes();
 
@@ -226,17 +225,17 @@
                 } else if (TAG_PHASE_FIRST.equals(name)) {
                     String boolval = getValue(value);
 
-                    if (boolval.equals("true")) {
+                    if (boolval.equals(BOOLEAN_TRUE)) {
                         handler.getRules().setPhaseFirst(true);
-                    } else if (boolval.equals("false")) {
+                    } else if (boolval.equals(BOOLEAN_FALSE)) {
                         handler.getRules().setPhaseFirst(false);
                     }
                 } else if (TAG_PHASE_LAST.equals(name)) {
                     String boolval = getValue(value);
 
-                    if (boolval.equals("true")) {
+                    if (boolval.equals(BOOLEAN_TRUE)) {
                         handler.getRules().setPhaseLast(true);
-                    } else if (boolval.equals("false")) {
+                    } else if (boolval.equals(BOOLEAN_FALSE)) {
                         handler.getRules().setPhaseLast(false);
                     }
                 }
@@ -300,19 +299,19 @@
             parameter.setParameterElement(parameterElement);
 
             // setting parameter Name
-            OMAttribute paraName = parameterElement.getAttribute(new QName(ATTRIBUTE_NAME));
+            OMAttribute paramName = parameterElement.getAttribute(new QName(ATTRIBUTE_NAME));
 
-            if (paraName == null) {
+            if (paramName == null) {
                 throw new DeploymentException(
-                        Messages.getMessage(DeploymentErrorMsgs.BAD_PARA_ARGU));
+                        Messages.getMessage(DeploymentErrorMsgs.BAD_PARAMETER_ARGUMENT));
             }
 
-            parameter.setName(paraName.getAttributeValue());
+            parameter.setName(paramName.getAttributeValue());
 
             // setting parameter Value (the chiled elemnt of the parameter)
-            OMElement paraValue = parameterElement.getFirstElement();
+            OMElement paramValue = parameterElement.getFirstElement();
 
-            if (paraValue != null) {
+            if (paramValue != null) {
                 parameter.setValue(parameterElement);
                 parameter.setParameterType(Parameter.OM_PARAMETER);
             } else {
@@ -323,17 +322,17 @@
             }
 
             // setting locking attribute
-            OMAttribute paraLocked = parameterElement.getAttribute(new QName(ATTRIBUTE_LOCKED));
-            Parameter parentpara = null;
+            OMAttribute paramLocked = parameterElement.getAttribute(new QName(ATTRIBUTE_LOCKED));
+            Parameter parentParam = null;
 
             if (parent != null) {
-                parentpara = parent.getParameter(parameter.getName());
+                parentParam = parent.getParameter(parameter.getName());
             }
 
-            if (paraLocked != null) {
-                String lockedValue = paraLocked.getAttributeValue();
+            if (paramLocked != null) {
+                String lockedValue = paramLocked.getAttributeValue();
 
-                if ("true".equals(lockedValue)) {
+                if (BOOLEAN_TRUE.equals(lockedValue)) {
 
                     // if the parameter is locked at some level parameter value replace by
that
                     if ((parent != null) && parent.isParameterLocked(parameter.getName()))
{
@@ -348,7 +347,7 @@
                 }
             }
 
-            if (Constants.WSA_ACTION.equals(paraName.getAttributeValue())) {
+            if (Constants.WSA_ACTION.equals(paramName.getAttributeValue())) {
                 wsamapping.add(parameter);
 
                 // no need to add this parameter , since this is just for mapping
@@ -357,7 +356,7 @@
 
             try {
                 if (parent != null) {
-                    if ((parentpara == null) || !parent.isParameterLocked(parameter.getName()))
{
+                    if ((parentParam == null) || !parent.isParameterLocked(parameter.getName()))
{
                         parameterInclude.addParameter(parameter);
                     }
                 } else {
@@ -379,7 +378,7 @@
      * @return String
      */
     public static String getShortFileName(String fileName) {
-        char seperator = '.';
+        char seperator = SEPARATOR_DOT;
         String value;
         int index = fileName.lastIndexOf(seperator);
 
@@ -399,7 +398,7 @@
      * @return String
      */
     protected String getValue(String in) {
-        char seperator = ':';
+        char seperator = SEPARATOR_COLON;
         String value;
         int index = in.indexOf(seperator);
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java
Sun Dec 18 23:15:08 2005
@@ -30,24 +30,26 @@
     private boolean isServer;
     private String repoLocation;
 
+    /**
+     * Load an AxisConfiguration from the repository directory specified
+     * 
+     * @param repoLocation
+     * @param isServer
+     */
     public FileSystemConfigurationCreator(String repoLocation, boolean isServer) {
         this.repoLocation = repoLocation;
         this.isServer = isServer;
     }
 
     /**
-     * First create a Deployment engine and using that , crate an AxisConfiguration , and
the
-     * Deployment Engine is totally file system dependent.
+     * First create a Deployment engine, use that to create an AxisConfiguration
      *
-     * @return
+     * @return Axis Configuration
      * @throws AxisFault
      */
     public AxisConfiguration getAxisConfiguration() throws AxisFault {
-        DeploymentEngine deploymentEngine;
-
         if (isServer) {
-            deploymentEngine = new DeploymentEngine(repoLocation);
-
+            DeploymentEngine deploymentEngine = new DeploymentEngine(repoLocation);
             return deploymentEngine.load();
         } else {
             return new DeploymentEngine().loadClient(repoLocation);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
Sun Dec 18 23:15:08 2005
@@ -44,9 +44,9 @@
     private AxisConfiguration axisConfig;
     private ModuleDescription module;
 
-    public ModuleBuilder(InputStream serviceInputSteram, ModuleDescription module,
+    public ModuleBuilder(InputStream serviceInputStream, ModuleDescription module,
                          AxisConfiguration axisConfig) {
-        super(serviceInputSteram, axisConfig);
+        super(serviceInputStream, axisConfig);
         this.axisConfig = axisConfig;
         this.module = module;
     }
@@ -166,7 +166,7 @@
                 op_descrip = new InOnlyAxisOperation();
             } else {
                 try {
-                    op_descrip = AxisOperationFactory.getOperetionDescription(mepURL);
+                    op_descrip = AxisOperationFactory.getOperationDescription(mepURL);
                 } catch (AxisFault axisFault) {
                     throw new DeploymentException(
                             Messages.getMessage(

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
Sun Dec 18 23:15:08 2005
@@ -54,9 +54,9 @@
         super.axisConfig = axisConfig;
     }
 
-    public ServiceBuilder(InputStream serviceInputSteram, AxisConfiguration axisConfig,
+    public ServiceBuilder(InputStream serviceInputStream, AxisConfiguration axisConfig,
                           AxisService service) {
-        super(serviceInputSteram, axisConfig);
+        super(serviceInputStream, axisConfig);
         this.service = service;
     }
 
@@ -234,11 +234,10 @@
                 // assumed MEP is in-out
                 op_descrip = new InOutAxisOperation();
             } else {
-                op_descrip = AxisOperationFactory.getOperetionDescription(mepurl);
+                op_descrip = AxisOperationFactory.getOperationDescription(mepurl);
             }
 
             op_descrip.setName(new QName(opname));
-            log.info(Messages.getMessage(DeploymentErrorMsgs.OP_NOT_FOUN_IN_WSDL, opname));
 
             // Operation Parameters
             Iterator parameters = operation.getChildrenWithName(new QName(TAG_PARAMETER));

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
Sun Dec 18 23:15:08 2005
@@ -34,12 +34,12 @@
 
 public class ServiceGroupBuilder extends DescriptionBuilder {
     private AxisConfiguration axisConfig;
-    private OMElement servcice;
+    private OMElement serviceElement;
     private HashMap wsdlServices;
 
-    public ServiceGroupBuilder(OMElement servcice, HashMap wsdlServices,
+    public ServiceGroupBuilder(OMElement service, HashMap wsdlServices,
                                AxisConfiguration axisConfig) {
-        this.servcice = servcice;
+        this.serviceElement = service;
         this.wsdlServices = wsdlServices;
         this.axisConfig = axisConfig;
         super.axisConfig = axisConfig;
@@ -52,21 +52,21 @@
         try {
 
             // Processing service level parameters
-            Iterator itr = servcice.getChildrenWithName(new QName(TAG_PARAMETER));
+            Iterator itr = serviceElement.getChildrenWithName(new QName(TAG_PARAMETER));
 
             processParameters(itr, axisServiceGroup, axisServiceGroup.getParent());
 
-            Iterator moduleConfigs = servcice.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
+            Iterator moduleConfigs = serviceElement.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
 
             processServiceModuleConfig(moduleConfigs, axisServiceGroup.getParent(),
                     axisServiceGroup);
 
             // processing servicewide modules which required to engage gloabally
-            Iterator moduleRefs = servcice.getChildrenWithName(new QName(TAG_MODULE));
+            Iterator moduleRefs = serviceElement.getChildrenWithName(new QName(TAG_MODULE));
 
             processModuleRefs(moduleRefs, axisServiceGroup);
 
-            Iterator serviceitr = servcice.getChildrenWithName(new QName(TAG_SERVICE));
+            Iterator serviceitr = serviceElement.getChildrenWithName(new QName(TAG_SERVICE));
 
             while (serviceitr.hasNext()) {
                 OMElement service = (OMElement) serviceitr.next();
@@ -101,7 +101,7 @@
     }
 
     /**
-     * To get the list og modules that is requird to be engage globally
+     * To get the list of modules that is required to be engaged globally
      *
      * @param moduleRefs <code>java.util.Iterator</code>
      * @throws DeploymentException <code>DeploymentException</code>

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java
Sun Dec 18 23:15:08 2005
@@ -18,29 +18,29 @@
 package org.apache.axis2.deployment.listener;
 
 /**
- * RepositoryListener is listening to a specific folder whether the folder is
- * update eg: remove , added or modified files
+ * RepositoryListener listens to a specific directory for updates.
+ * eg: addition, removal or modification of files
  */
 public interface RepositoryListener {
 
     /**
-     * this method is to check whether new module is added (or modules)
+     * this method is to check whether new module has been added
      */
     void checkModules();
 
     /**
-     * this method is to check whether new service is added (or services)
+     * this method is to check whether new service has been added 
      */
     void checkServices();
 
     /**
-     * this is to Initialize the Deployment , this only call when the Axis engine start up
-     * Then it should deploy all the WS and modules , and should initialize the WSInfoList
+     * this is to initialize the Deployment, this is invoked during Axis engine start up
+     * at which point it should deploy all the services and modules, and initialize the WSInfoList
      */
     void init();
 
     /**
-     * If new services or modules(service or module) are added then this method will call
+     * If new services or modules are added then this method will invoked
      */
     void update();
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
Sun Dec 18 23:15:08 2005
@@ -28,37 +28,35 @@
 
 public class RepositoryListenerImpl implements RepositoryListener, DeploymentConstants {
     protected Log log = LogFactory.getLog(getClass());
-    private DeploymentEngine deEngine;
+    private DeploymentEngine deploymentEngine;
 
     /**
      * The parent directory of the modules and services directories
-     * taht the listentner should listent
      */
     private String folderName;
 
     /**
-     * Referance to a WSInfoList
+     * Reference to a WSInfoList
      */
     private WSInfoList wsInfoList;
 
     /**
-     * This constructor take two argumnets folder name and referance to Deployment Engine
-     * Fisrt it initilize the syetm , by loading all the modules in the /modules directory
-     * and also create a WSInfoList to keep infor about available modules and services
+     * This constructor takes two arguments, a folder name and a reference to Deployment
Engine
+     * Fisrt it initilize the system, by loading all the modules in the /modules directory
+     * and also creates a WSInfoList to store information about available modules and services
      *
-     * @param folderName    path to parent directory that the listener should listent
-     * @param deploy_engine refearnce to engine registry  inorder to inform the updates
+     * @param folderName    path to parent directory that the listener should listen to
+     * @param deploymentEngine reference to engine registry for updates
      */
-    public RepositoryListenerImpl(String folderName, DeploymentEngine deploy_engine) {
+    public RepositoryListenerImpl(String folderName, DeploymentEngine deploymentEngine) {
         this.folderName = folderName;
-        wsInfoList = new WSInfoList(deploy_engine);
-        this.deEngine = deploy_engine;
+        wsInfoList = new WSInfoList(deploymentEngine);
+        this.deploymentEngine = deploymentEngine;
         init();
     }
 
     /**
-     * this method ask serachWS to serch for the folder to caheck
-     * for updates
+     * Find a list of modules in this folder and add to wsInfoList
      */
     public void checkModules() {
         String modulepath = folderName + MODULE_PATH;
@@ -74,10 +72,7 @@
                         wsInfoList.addWSInfoItem(file, TYPE_MODULE);
                     }
                 } else {
-                    if ("lib".equals(file.getName()) || "Lib".equals(file.getName())) {
-
-                        // this is a lib file no need to take this as a sevice
-                    } else {
+                    if (!"lib".equalsIgnoreCase(file.getName())) {
                         wsInfoList.addWSInfoItem(file, TYPE_MODULE);
                     }
                 }
@@ -86,13 +81,12 @@
     }
 
     /**
-     * this method ask serachWS to serch for the folder to caheck
-     * for updates
+     * Find a list of services in this folder and add to wsInfoList
      */
     public void checkServices() {
         String modulepath = folderName + SERVICE_PATH;
 
-        searchWS(modulepath);
+        findServicesInDirectory(modulepath);
         update();
     }
 
@@ -105,14 +99,14 @@
     public void init() {
         wsInfoList.init();
         checkModules();
-        deEngine.doDeploy();
+        deploymentEngine.doDeploy();
     }
 
     /**
      * This method is to search a given folder  for jar files
      * and added them to a list wich is in the WSInfolist class
      */
-    private void searchWS(String folderName) {
+    private void findServicesInDirectory(String folderName) {
         File root = new File(folderName);
         File[] files = root.listFiles();
 
@@ -125,10 +119,7 @@
                         wsInfoList.addWSInfoItem(file, TYPE_SERVICE);
                     }
                 } else {
-                    if ("lib".equals(file.getName()) || "Lib".equals(file.getName())) {
-
-                        // this is a lib file no need to take this as a sevice
-                    } else {
+                    if (!"lib".equalsIgnoreCase(file.getName())) {
                         wsInfoList.addWSInfoItem(file, TYPE_SERVICE);
                     }
                 }
@@ -137,7 +128,7 @@
     }
 
     /**
-     * this is the actual method that is call from scheduler
+     * this is the actual method that is invoked from the scheduler
      */
     public void startListener() {
         checkServices();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
Sun Dec 18 23:15:08 2005
@@ -28,8 +28,8 @@
 import java.util.ArrayList;
 
 /**
- * ArchiveFileData = Hot Deployment File Item , to store infromation of the module or servise
- * item to be deploy
+ * ArchiveFileData = Hot Deployment File Item, stores infromation about the module or service
+ * item to be deployed
  */
 public class ArchiveFileData {
     private File file = null;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Sun Dec 18 23:15:08 2005
@@ -120,16 +120,16 @@
             int BUFFER = 2048;
 
             if (axis2repository == null) {
-                String userHome = System.getProperty("user.home");
+                String userHome = System.getProperty(DeploymentConstants.PROPERTY_USER_HOME);
                 File userHomedir = new File(userHome);
-                File repository = new File(userHomedir, ".axis2home");
+                File repository = new File(userHomedir, DIRECTORY_AXIS2_HOME);
 
-                modules = new File(repository, "modules");
+                modules = new File(repository, DIRECTORY_MODULES);
             } else {
-                modules = new File(axis2repository, "modules");
+                modules = new File(axis2repository, DIRECTORY_MODULES);
             }
 
-            String modulearchiveName = moduleName + ".mar";
+            String modulearchiveName = moduleName + SUFFIX_MAR;
 
             modulearchiveFile = new File(modules, modulearchiveName);
 
@@ -138,16 +138,16 @@
             }
 
             ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            InputStream in = cl.getResourceAsStream("modules/" + moduleName + ".mar");
+            InputStream in = cl.getResourceAsStream(RESOURCE_MODULES + moduleName + SUFFIX_MAR);
 
             if (in == null) {
-                in = cl.getResourceAsStream("modules/" + moduleName + ".jar");
+                in = cl.getResourceAsStream(RESOURCE_MODULES + moduleName + SUFFIX_JAR);
             }
 
             if (in == null) {
                 throw new DeploymentException(
                         Messages.getMessage(
-                                DeploymentErrorMsgs.MODULEXML_NOT_FOUND_FOR_THE_MODULE, moduleName));
+                                DeploymentErrorMsgs.MODULE_XML_MISSING, moduleName));
             } else {
                 if (!modules.exists()) {
                     modules.mkdirs();
@@ -237,7 +237,7 @@
                             Messages.getMessage(DeploymentErrorMsgs.FILE_NOT_FOUND, e.getMessage()));
                 } catch (XMLStreamException e) {
                     throw new DeploymentException(
-                            Messages.getMessage(DeploymentErrorMsgs.XTZX_EXCEPTION, e.getMessage()));
+                            Messages.getMessage(DeploymentErrorMsgs.XML_STREAM_EXCEPTION,
e.getMessage()));
                 }
             } else {
                 throw new DeploymentException(
@@ -298,16 +298,14 @@
                 if (!meta_inf.exists()) {
                     throw new DeploymentException(
                             Messages.getMessage(
-                                    DeploymentErrorMsgs.NO_META_INF, serviceFile.getName()));
+                                    DeploymentErrorMsgs.META_INF_MISSING, serviceFile.getName()));
                 }
 
                 File files[] = meta_inf.listFiles();
 
                 for (int i = 0; i < files.length; i++) {
                     File file1 = files[i];
-                    String fileName = file1.getName();
-
-                    if (fileName.endsWith(".wsdl") || fileName.endsWith(".WSDL")) {
+                    if (file1.getName().toLowerCase().endsWith(SUFFIX_WSDL)) {
                         InputStream in = new FileInputStream(file1);
                         AxisService service = processWSDLFile(in);
 
@@ -337,11 +335,10 @@
                 ByteArrayOutputStream out;
 
                 while ((entry = zin.getNextEntry()) != null) {
-                    String entryName = entry.getName();
+                    String entryName = entry.getName().toLowerCase();
 
-                    if ((entryName.startsWith(META_INF) || entryName.startsWith(
-                            META_INF.toLowerCase())) && (entryName.endsWith(
-                            ".wsdl") || entryName.endsWith(".WSDL"))) {
+                    if (entryName.startsWith(META_INF.toLowerCase()) 
+                            && entryName.endsWith(SUFFIX_WSDL)) {
                         out = new ByteArrayOutputStream();
 
                         while ((read = zin.read(buf)) > 0) {
@@ -408,7 +405,7 @@
                 if (!foundmoduleXML) {
                     throw new DeploymentException(
                             Messages.getMessage(
-                                    DeploymentErrorMsgs.MODULEXML_NOT_FOUND_FOR_THE_MODULE,
filename));
+                                    DeploymentErrorMsgs.MODULE_XML_MISSING, filename));
                 }
             } catch (Exception e) {
                 throw new DeploymentException(e);
@@ -437,7 +434,7 @@
             } else {
                 throw new DeploymentException(
                         Messages.getMessage(
-                                DeploymentErrorMsgs.MODULEXML_NOT_FOUND_FOR_THE_MODULE, filename));
+                                DeploymentErrorMsgs.MODULE_XML_MISSING, filename));
             }
         }
     }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java
Sun Dec 18 23:15:08 2005
@@ -83,7 +83,7 @@
         return abOpdesc;
     }
 
-    public static AxisOperation getOperetionDescription(String mepURI) throws AxisFault {
+    public static AxisOperation getOperationDescription(String mepURI) throws AxisFault {
         AxisOperation abOpdesc;
 
         if (MEP_URI_IN_ONLY.equals(mepURI)) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=357657&r1=357656&r2=357657&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
Sun Dec 18 23:15:08 2005
@@ -189,7 +189,7 @@
      */
     private AxisOperation copyOperation(AxisOperation axisOperation) throws AxisFault {
         AxisOperation operation =
-                AxisOperationFactory.getOperetionDescription(axisOperation.getMessageExchangePattern());
+                AxisOperationFactory.getOperationDescription(axisOperation.getMessageExchangePattern());
 
         operation.setMessageReceiver(axisOperation.getMessageReceiver());
         operation.setName(axisOperation.getName());



Mime
View raw message