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 2005/09/09 19:17:43 UTC
svn commit: r279824 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/context/ core/src/org/apache/axis2/deployment/
core/src/org/apache/axis2/engine/
databinding/src/org/apache/axis2/databinding/metadata/
integration/test/org/apach...
Author: gdaniels
Date: Fri Sep 9 10:17:22 2005
New Revision: 279824
URL: http://svn.apache.org/viewcvs?rev=279824&view=rev
Log:
Just a little cleanup
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/metadata/ElementDesc.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=279824&r1=279823&r2=279824&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java Fri Sep 9 10:17:22 2005
@@ -31,17 +31,17 @@
/**
* Build the configuration for the Server
- * @param RepositaryName
+ * @param repositoryName
* @return
* @throws DeploymentException
*/
public ConfigurationContext buildConfigurationContext(
- String RepositaryName)
+ String repositoryName)
throws DeploymentException {
ConfigurationContext configurationContext = null;
try {
DeploymentEngine deploymentEngine =
- new DeploymentEngine(RepositaryName);
+ new DeploymentEngine(repositoryName);
AxisConfiguration configuration = deploymentEngine.load();
PhaseResolver phaseResolver = new PhaseResolver(configuration);
configurationContext = new ConfigurationContext(configuration);
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=279824&r1=279823&r2=279824&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 Fri Sep 9 10:17:22 2005
@@ -111,22 +111,22 @@
* This the constructor which is used by Engine inorder to start
* Deploymenat module,
*
- * @param RepositaryName is the path to which Repositary Listner should
+ * @param repositoryName is the path to which Repositary Listner should
* listent.
*/
- public DeploymentEngine(String RepositaryName) throws DeploymentException {
- this(RepositaryName, SERVER_XML_FILE);
+ public DeploymentEngine(String repositoryName) throws DeploymentException {
+ this(repositoryName, SERVER_XML_FILE);
}
- public DeploymentEngine(String RepositoryName, String serverXMLFile)
+ public DeploymentEngine(String repositoryName, String serverXMLFile)
throws DeploymentException {
- if (RepositoryName == null || RepositoryName.trim().equals("")) {
+ if (repositoryName == null || repositoryName.trim().equals("")) {
throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.REPO_CAN_NOT_BE_NULL));
}
- this.folderName = RepositoryName;
- axis2repository = RepositoryName;
- File repository = new File(RepositoryName);
+ this.folderName = repositoryName;
+ axis2repository = repositoryName;
+ File repository = new File(repositoryName);
if (!repository.exists()) {
repository.mkdirs();
File services = new File(repository, "services");
@@ -174,7 +174,7 @@
}
}
// factory = new ConfigurationContextFactory();
- this.engineConfigName = RepositoryName + '/' + serverXMLFile;
+ this.engineConfigName = repositoryName + '/' + serverXMLFile;
}
public ArchiveFileData getCurrentFileItem() {
@@ -529,7 +529,7 @@
addFlowHandlers(faultOutFlow);
}
loadModuleClass(modulemetadata);
- axisConfig.addMdoule(modulemetadata);
+ axisConfig.addModule(modulemetadata);
log.info(Messages.getMessage(DeploymentErrorMsgs.ADDING_NEW_MODULE));
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=279824&r1=279823&r2=279824&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Fri Sep 9 10:17:22 2005
@@ -78,7 +78,6 @@
*
* @param name
* @return
- * @throws AxisFault
*/
public ModuleDescription getModule(QName name);
@@ -88,7 +87,7 @@
* @param module
* @throws AxisFault
*/
- public void addMdoule(ModuleDescription module) throws AxisFault;
+ public void addModule(ModuleDescription module) throws AxisFault;
public boolean isEngaged(QName moduleName);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=279824&r1=279823&r2=279824&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java Fri Sep 9 10:17:22 2005
@@ -168,7 +168,7 @@
* @param module
* @throws AxisFault
*/
- public synchronized void addMdoule(ModuleDescription module) throws AxisFault {
+ public synchronized void addModule(ModuleDescription module) throws AxisFault {
module.setParent(this);
modules.put(module.getName(), module);
}
@@ -418,7 +418,7 @@
engagedModules.add(moduleref);
}
if (isNewmodule) {
- addMdoule(module);
+ addModule(module);
}
}
Modified: webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/metadata/ElementDesc.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/metadata/ElementDesc.java?rev=279824&r1=279823&r2=279824&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/metadata/ElementDesc.java (original)
+++ webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/metadata/ElementDesc.java Fri Sep 9 10:17:22 2005
@@ -18,7 +18,6 @@
import org.apache.axis2.databinding.Deserializer;
import org.apache.axis2.databinding.DeserializationTarget;
import org.apache.axis2.databinding.Serializer;
-import org.apache.axis2.databinding.DeserializerFactory;
import org.apache.axis2.databinding.serializers.CollectionSerializer;
import javax.xml.namespace.QName;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=279824&r1=279823&r2=279824&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Fri Sep 9 10:17:22 2005
@@ -118,7 +118,7 @@
ConfigurationContext sysContext =
efac.buildClientConfigurationContext("target/test-resources/intregrationRepo");
- sysContext.getAxisConfiguration().addMdoule(moduleDesc);
+ sysContext.getAxisConfiguration().addModule(moduleDesc);
//sysContext.getAxisConfiguration().engageModule(moduleDesc.getName());
sysContext.getAxisConfiguration().addService(service);