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 de...@apache.org on 2006/01/26 12:43:20 UTC
svn commit: r372509 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/DeploymentEngine.java deployment/ServiceBuilder.java
description/AxisModule.java engine/AxisConfiguration.java
Author: deepal
Date: Thu Jan 26 03:42:01 2006
New Revision: 372509
URL: http://svn.apache.org/viewcvs?rev=372509&view=rev
Log:
- fixing module version bugs
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
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=372509&r1=372508&r2=372509&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 Thu Jan 26 03:42:01 2006
@@ -422,6 +422,7 @@
archiveReader.readModuleArchive(currentArchiveFile.getAbsolutePath(),
this, metaData, explodedDir,
axisConfig);
+ metaData.setFileName(currentArchiveFile.getAbsolutePath());
addNewModule(metaData);
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE,
metaData.getName().getLocalPart()));
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=372509&r1=372508&r2=372509&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 Thu Jan 26 03:42:01 2006
@@ -19,15 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.AxisMessage;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisOperationFactory;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.ModuleConfiguration;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterInclude;
-import org.apache.axis2.description.PolicyInclude;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
@@ -98,11 +90,10 @@
}
OMAttribute targetNameSpace = service_element.getAttribute(new QName(TARGET_NAME_SPACE));
- if(targetNameSpace!=null){
- String nameSpeceVale= targetNameSpace.getAttributeValue();
+ if (targetNameSpace != null) {
+ String nameSpeceVale = targetNameSpace.getAttributeValue();
}
-
// setting the PolicyInclude
// processing <wsp:Policy> .. </..> elements
@@ -184,6 +175,23 @@
DeploymentErrorMsgs.OPERATION_PROCESS_ERROR, axisFault.getMessage()));
}
return service;
+ }
+
+
+ /**
+ * To get url and prefix from a given atribute
+ *
+ * @param value
+ * @return
+ */
+ private String[] splitAttribute(String value) {
+ int splitindex = value.indexOf(':');
+ if (splitindex > 0) {
+ return new String[]{value.substring(0, splitindex - 1),
+ value.substring(splitindex + 1, value.length())};
+ } else {
+ return new String[]{value};
+ }
}
private void processMessages(Iterator messages, AxisOperation operation)
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java?rev=372509&r1=372508&r2=372509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java Thu Jan 26 03:42:01 2006
@@ -48,6 +48,8 @@
private final ParameterInclude parameters = new ParameterIncludeImpl();
private Module module;
private ClassLoader moduleClassLoader;
+ // To keep the File that moduel came from
+ private String fileName = "";
/**
* Field name
@@ -249,5 +251,13 @@
public void setModuleDescription(String moduleDescription) {
this.moduleDescription = moduleDescription;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
}
}
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=372509&r1=372508&r2=372509&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 Thu Jan 26 03:42:01 2006
@@ -19,7 +19,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.modules.Module;
import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.deployment.repository.util.ArchiveReader;
@@ -459,17 +458,14 @@
if (module != null) {
return module;
}
- String moduelName = name.getLocalPart();
// checking whether the version string seperator is not there in the module name
- if (moduelName.lastIndexOf('-') < 0) {
- String moduleName = name.getLocalPart();
- String defaultModuleVersion = getDefaultModuleVersion(moduleName);
- if (defaultModuleVersion != null) {
- module = (AxisModule) allModules.get(
- Utils.getModuleName(moduleName, defaultModuleVersion));
- if (module != null) {
- return module;
- }
+ String moduleName = name.getLocalPart();
+ String defaultModuleVersion = getDefaultModuleVersion(moduleName);
+ if (defaultModuleVersion != null) {
+ module = (AxisModule) allModules.get(
+ Utils.getModuleName(moduleName, defaultModuleVersion));
+ if (module != null) {
+ return module;
}
}
return null;