axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r412144 - /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
Date Tue, 06 Jun 2006 15:16:55 GMT
Author: dims
Date: Tue Jun  6 08:16:54 2006
New Revision: 412144

URL: http://svn.apache.org/viewvc?rev=412144&view=rev
Log:
fix for AXIS2-803 - fix small issue causing null pointer exception, fix typos, add javadoc
comments.  

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?rev=412144&r1=412143&r2=412144&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
Tue Jun  6 08:16:54 2006
@@ -1,153 +1,260 @@
-package org.apache.axis2.deployment;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-/*
-* Copyright 2004,2005 The Apache Software Foundation.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-*
-*/
-
-public class WarBasedAxisConfigurator implements AxisConfigurator {
-
-    private AxisConfiguration axisConfig;
-	private static final Log log = LogFactory.getLog(WarBasedAxisConfigurator.class);
-    private ServletConfig config;
-    private DeploymentEngine deploymentEngine;
-
-    public WarBasedAxisConfigurator(ServletConfig svconfig) {
-        try {
-            this.config = svconfig;
-            deploymentEngine = new DeploymentEngine();
-            String axis2xmlpath = config.getInitParameter("axis2.xml.path");
-            String repository;
-            InputStream axis2Steram;
-            if (axis2xmlpath != null) {
-                axis2Steram = new FileInputStream(axis2xmlpath);
-                axisConfig = deploymentEngine.populateAxisConfiguration(axis2Steram);
-            } else {
-                String axisurl = config.getInitParameter("axis2.xml.url");
-                if (axisurl != null) {
-                    axis2Steram = new URL(axisurl).openStream();
-                    deploymentEngine.populateAxisConfiguration(axis2Steram);
-                } else {
-                    try {
-                        repository = config.getServletContext().getRealPath("/WEB-INF");
-                        axis2Steram = new FileInputStream(repository + "/conf/axis2.xml");
-                        axisConfig = deploymentEngine.populateAxisConfiguration(axis2Steram);
-                        setWebLocationProperty(config.getServletContext(), deploymentEngine);
-                    } catch (Exception e) {
-                        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-                        axis2Steram = cl.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
-                        axisConfig = deploymentEngine.populateAxisConfiguration(axis2Steram);
-                    }
-                }
-            }
-            if(axisConfig == null) {
-                throw new RuntimeException("Unable to load axis2.xml configuration");
-            }
-            Parameter unableHttp = new Parameter("enableHTTP", "true");
-            axisConfig.addParameter(unableHttp);
-        } catch (FileNotFoundException e) {
-            log.info(e.getMessage());
-        } catch (DeploymentException e) {
-            log.info(e.getMessage());
-        } catch (MalformedURLException e) {
-            log.info(e.getMessage());
-        } catch (IOException e) {
-            log.info(e.getMessage());
-        }
-    }
-
-    /**
-     * To find out the location where web reposurce need to be coiped, when
-     * deployment fine any service aar with web resources.
-     *
-     * @param context
-     */
-    private void setWebLocationProperty(ServletContext context, DeploymentEngine depeng)
{
-        String webpath = context.getRealPath("");
-        if (webpath == null || "".equals(webpath)) {
-            return;
-        }
-        File weblocation = new File(webpath);
-        depeng.setWebLocationString(weblocation.getAbsolutePath());
-    }
-
-    public AxisConfiguration getAxisConfiguration() throws AxisFault {
-        try {
-            String repository;
-            String axis2repopath = config.getInitParameter("axis2.repository.path");
-            if (axis2repopath != null) {
-                deploymentEngine.loadRepository(axis2repopath);
-            } else {
-                String axis2repourl = config.getInitParameter("axis2.repository.url");
-                if (axis2repourl != null) {
-                    deploymentEngine.loadRepositoryFromURL(new URL(axis2repourl));
-                } else {
-                    try {
-                        repository = config.getServletContext().getRealPath("/WEB-INF");
-                        deploymentEngine.loadRepository(repository);
-                    } catch (Exception e) {
-                        deploymentEngine.loadFromClassPath();
-                    }
-                }
-            }
-        } catch (MalformedURLException e) {
-            log.info(e.getMessage());
-        }
-        return axisConfig;
-    }
-
-    //to load services
-    public void loadServices() {
-        try {
-            String axis2repopath = config.getInitParameter("axis2.repository.path");
-            if (axis2repopath != null) {
-                deploymentEngine.loadServices();
-            } else {
-                String axis2repourl = config.getInitParameter("axis2.repository.url");
-                if (axis2repourl != null) {
-                    deploymentEngine.loadServicesFromUrl(new URL(axis2repourl));
-                } else {
-                    try {
-                        //is it unpack
-                        config.getServletContext().getRealPath("/WEB-INF");
-                        deploymentEngine.loadServices();
-                    } catch (Exception e) {
-                        log.info(e.getMessage());
-                    }
-                }
-            }
-        } catch (MalformedURLException e) {
-            log.info(e.getMessage());
-        }
-    }
-
-    //To engage globally listed modules
-    public void engageGlobalModules() throws AxisFault {
-        deploymentEngine.engageModules();
-    }
-}
+package org.apache.axis2.deployment;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.AxisConfigurator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*
+*/
+
+/**
+* Processes the init parameters for the AxisServlet.
+This allows the location of the axis2.xml and the module repository to be different from
the default locations.
+The init parameters support alternate file, or URL values for both of these.
+*/
+public class WarBasedAxisConfigurator implements AxisConfigurator {
+
+    private AxisConfiguration axisConfig;
+	private static final Log log = LogFactory.getLog(WarBasedAxisConfigurator.class);
+    private ServletConfig config;
+    private DeploymentEngine deploymentEngine;
+
+
+    /**
+    * The name of the init parameter (axis2.xml.path) that can be used to override the default
location for the axis2.xml file. When both this init parameter, and the axis2.xml.url init
parameters are not specified in the axis servlet init-parameter, the default location of ${app}/WEB-INF/conf/axis2.xml
is used.
+    * The value of this path is interpreted as a file system absolute path.
+    * This parameter takes precidence over the axis2.xml.url init parameter.
+    */
+    public static final String PARAM_AXIS2_XML_PATH = "axis2.xml.path";
+
+
+    /**
+    * The name of the init parameter (axis2.xml.url) that when specified indicates the axis2.xml
should be loaded using the URL specified as the value of this init parameter. If the axis2.xml.path
init parameter is present, this init parameter has no effect.
+    */
+    public static final String PARAM_AXIS2_XML_URL = "axis2.xml.url";
+
+
+    /**
+    * The name of the init parameter (axis2.repository.path) that when specified indicates
the path to the
+    */
+    public static final String PARAM_AXIS2_REPOSITORY_PATH = "axis2.repository.path";
+
+
+    /**
+    * The name of the init parameter (axis2.repository.url) that when specified indicates
the url to be used
+    */
+    public static final String PARAM_AXIS2_REPOSITORY_URL = "axis2.repository.url";
+
+
+    /**
+    * Default constructor for configurator.
+    * This determines the axis2.xml file to be used from the init parametes for the AxisServlet
in the web.xml.
+    * The order of initialization is according the the following precidence:
+    * <ul>
+    * <li>If the parameter axis2.xml.path is present, the value is webapp relative
path to be used as the location to the axis2.xml file.
+    * <li>Otherwise, if the parameter axis2.xml.url is present, the URL is used as
the location to the axis2.xml file.
+    * <li>Otherwise, when both of the above init parameters are not present, file is
attempted to be loaded from &lt;repo&gt;/WEB-INF/axis2.xml.
+    * <li> When none of the above could be found, the axis2.xml is loaded from the
classpath resource, the value of DeploymenConstants.AXIS2_CONFIGURATION_RESOURCE.
+    * </ul>
+    *
+    * @param svconfig the ServletConfig object from the AxisServlet. This method is called
from the init() of the AxisServlet.
+    */
+    public WarBasedAxisConfigurator(ServletConfig svconfig) {
+        try {
+            this.config = svconfig;
+            deploymentEngine = new DeploymentEngine();
+            InputStream axis2Stream = null;
+
+            try {
+
+                if (axis2Stream == null) {
+                    String axis2xmlpath = config.getInitParameter(PARAM_AXIS2_XML_PATH);
+                    if (axis2xmlpath != null) {
+                        // when init parameter was present.
+                        axis2Stream = new FileInputStream(axis2xmlpath);
+                        log.debug("using axis2.xml from path: " + axis2xmlpath);
+                    }
+                }
+
+                if (axis2Stream == null) {
+                    String axisurl = config.getInitParameter(PARAM_AXIS2_XML_URL);
+                    if (axisurl != null) {
+                        axis2Stream = new URL(axisurl).openStream();
+                        axisConfig = deploymentEngine.populateAxisConfiguration(axis2Stream);
+                        log.debug("loading axis2.xml from URL: " + axisurl);
+                    }
+                }
+
+                if (axis2Stream == null) {
+                    // both the axis2.xml.path and axis2.xml.url init parameters were not
present
+                    // try to find the default /WEB-INF/conf/axis2.xml
+                    axis2Stream = config.getServletContext().getResourceAsStream("WEB-INF/conf/axis2.xml");
+                    log.debug("trying to load axis2.xml from module: /WEB-INF/conf/axis2.xml");
+                }
+            } // try
+            catch (Exception e) {
+                log.error(e, e);
+                log.warn("Using default configuration: " + DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
+                // not there, use default configuration from class path resource.
+                ClassLoader cl = Thread.currentThread().getContextClassLoader();
+                axis2Stream = cl.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
+            } // catch
+
+            axisConfig = deploymentEngine.populateAxisConfiguration(axis2Stream);
+
+
+            // when the module is an unpacked war file,
+            // we can set the web location path in the deployment engine.
+            // This will let us
+            String webpath = config.getServletContext().getRealPath("");
+            if (webpath != null && !"".equals(webpath)) {
+                log.debug("setting web location string: " + webpath);
+                File weblocation = new File(webpath);
+                deploymentEngine.setWebLocationString(weblocation.getAbsolutePath());
+            } // if webpath not null
+
+
+        } catch (DeploymentException e) {
+            log.error(e.getMessage(), e);
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+        } finally {
+            try {
+                Parameter enableHttp = new Parameter("enableHTTP", "true");
+                if (axisConfig != null) {
+                    axisConfig.addParameter(enableHttp);
+                }
+                else {
+                    log.error("axisConfig was null after initialization");
+                }
+            } catch (AxisFault axisFault) {
+                log.info(axisFault.getMessage());
+            }
+        }
+    }
+
+
+
+    /**
+    * Gets the axis configuration object by loading the repository.
+    * The order of initialization is according the the following precidence:
+    * <ul>
+    * <li>If the parameter axis2.repository.path is present, this folder is used as
the location to the repository.
+    * <li>Otherwise, if the parameter axis2.repository.url is present, the URL is used
as the location to the repository.
+    * <li>Otherwise, when both of the above init parameters are not present, the web
applications WEB-INF folder is used as the folder for the repository.
+    * </ul>
+    *
+    * @return the instance of the AxisConfiguration object that reflects the repository according
to the rules above.
+    * @throws AxisFault when an error occured in the initialization of the AxisConfiguration.
+    */
+    public AxisConfiguration getAxisConfiguration() throws AxisFault {
+        try {
+            String repository = null;
+
+            if (repository == null) {
+                repository = config.getInitParameter(PARAM_AXIS2_REPOSITORY_PATH);
+                if (repository != null) {
+                    deploymentEngine.loadRepository(repository);
+                    log.debug("loaded repository from path: " + repository);
+                }
+            }
+
+            if (repository == null) {
+                repository = config.getInitParameter(PARAM_AXIS2_REPOSITORY_URL);
+                if (repository != null) {
+                    deploymentEngine.loadRepositoryFromURL(new URL(repository));
+                    log.debug("loaded repository from url: " + repository);
+                }
+            }
+
+            if (repository == null) {
+                if (config.getServletContext().getRealPath("") != null) {
+                    // this is an unpacked war file
+                    repository = config.getServletContext().getRealPath("/WEB-INF");
+                }
+                if (repository != null) {
+                    deploymentEngine.loadRepository(repository);
+                    log.debug("loaded repository from /WEB-INF folder (unpacked war)");
+                }
+            }
+
+            if (repository == null) {
+                deploymentEngine.loadFromClassPath();
+                log.debug("loaded repository from classpath");
+            }
+
+        } catch (Exception ex) {
+            log.error(ex + ": loading repository from classpath");
+            deploymentEngine.loadFromClassPath();
+        }
+        return axisConfig;
+    }
+
+
+    //to load services
+    /**
+    * Loads the services within the repository.
+    * When the axis2.repository.path init parameter was present, we just call loadServices()
in the deployment engine.<br/>
+    * When the axis2.repository.url init parameter was present we load services from the
respective URL value of the init parameter.<br/>
+    * Otherwise, try to load the services from the /WEB-INF folder within the web application.
+    */
+    public void loadServices() {
+        try {
+            String repository = null;
+
+
+            if (repository == null) {
+                repository = config.getInitParameter(PARAM_AXIS2_REPOSITORY_PATH);
+                if (repository != null) {
+                    deploymentEngine.loadServices();
+                    log.debug("loaded services from path: " + repository);
+                }
+            }
+
+            if (repository == null) {
+                repository = config.getInitParameter(PARAM_AXIS2_REPOSITORY_URL);
+                if (repository!= null) {
+                    deploymentEngine.loadServicesFromUrl(new URL(repository));
+                    log.debug("loaded services from URL: " + repository);
+                }
+            }
+
+            if (repository == null) {
+                if (config.getServletContext().getRealPath("") != null) {
+                    deploymentEngine.loadServices();
+                    log.debug("loaded services from webapp");
+                }
+            } // else
+        } catch (MalformedURLException e) {
+            log.info(e.getMessage());
+        }
+    }
+
+    //To engage globally listed modules
+    public void engageGlobalModules() throws AxisFault {
+        deploymentEngine.engageModules();
+    }
+}



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


Mime
View raw message