You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2006/01/25 15:01:00 UTC
svn commit: r372217 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/DeploymentEngine.java deployment/ModuleBuilder.java
engine/AxisConfiguration.java util/Utils.java
Author: deepal
Date: Wed Jan 25 06:00:50 2006
New Revision: 372217
URL: http://svn.apache.org/viewcvs?rev=372217&view=rev
Log:
-fixing some problems with module versioning
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/ModuleBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.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=372217&r1=372216&r2=372217&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 Wed Jan 25 06:00:50 2006
@@ -504,6 +504,7 @@
setClassLoaders(axis2repository);
setDeploymentFeatures();
RepositoryListener repoListener = new RepositoryListenerImpl(axis2repository, this);
+ org.apache.axis2.util.Utils.calculateDefaultModuleVersion(axisConfig.getModules(), axisConfig);
try {
axisConfig.setRepository(axis2repository);
if (!useDefault) {
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=372217&r1=372216&r2=372217&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 Wed Jan 25 06:00:50 2006
@@ -67,15 +67,15 @@
OMElement moduleElement = buildOM();
// Setting Module Name
- OMAttribute moduleNameAtt = moduleElement.getAttribute(new QName(ATTRIBUTE_NAME));
-
- if (moduleNameAtt != null) {
- String moduleName = moduleNameAtt.getAttributeValue();
-
- if ((moduleName != null) && !"".equals(moduleName)) {
- module.setName(new QName(moduleName));
- }
- }
+// OMAttribute moduleNameAtt = moduleElement.getAttribute(new QName(ATTRIBUTE_NAME));
+//
+//// if (moduleNameAtt != null) {
+//// String moduleName = moduleNameAtt.getAttributeValue();
+////
+//// if ((moduleName != null) && !"".equals(moduleName)) {
+//// module.setName(new QName(moduleName));
+//// }
+//// }
// Setting Module Class , if it is there
OMAttribute moduleClassAtt = moduleElement.getAttribute(new QName(TAG_CLASS_NAME));
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=372217&r1=372216&r2=372217&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 Wed Jan 25 06:00:50 2006
@@ -461,7 +461,7 @@
}
String moduelName = name.getLocalPart();
// checking whether the version string seperator is not there in the module name
- if (moduelName.indexOf('-') < 0) {
+ if (moduelName.lastIndexOf('-') < 0) {
String moduleName = name.getLocalPart();
String defaultModuleVersion = getDefaultModuleVersion(moduleName);
if (defaultModuleVersion != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=372217&r1=372216&r2=372217&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Wed Jan 25 06:00:50 2006
@@ -226,7 +226,7 @@
public static String getModuleName(String moduleName) {
char version_seperator = '-';
- int version_index = moduleName.indexOf(version_seperator);
+ int version_index = moduleName.lastIndexOf(version_seperator);
if (version_index > 0) {
return moduleName.substring(0, version_index);
} else {
@@ -236,7 +236,7 @@
public static String getModuleVersion(String moduleName) {
char version_seperator = '-';
- int version_index = moduleName.indexOf(version_seperator);
+ int version_index = moduleName.lastIndexOf(version_seperator);
if (version_index > 0) {
return moduleName.substring(version_index + 1, moduleName.length());
} else {