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/02/02 07:22:23 UTC
svn commit: r374283 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/AxisServiceBuilder.java
deployment/listener/RepositoryListenerImpl.java description/AxisModule.java
description/AxisOperationFactory.java util/Utils.java
Author: deepal
Date: Wed Feb 1 22:22:09 2006
New Revision: 374283
URL: http://svn.apache.org/viewcvs?rev=374283&view=rev
Log:
-minor changes for module versoning
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.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/description/AxisModule.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.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/AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java?rev=374283&r1=374282&r2=374283&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java Wed Feb 1 22:22:09 2006
@@ -25,13 +25,13 @@
import org.apache.axis2.util.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.policy.Policy;
import org.apache.ws.policy.PolicyConstants;
import org.apache.ws.policy.PolicyReference;
import org.apache.ws.policy.util.DOMPolicyReader;
import org.apache.ws.policy.util.PolicyFactory;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.impl.WSDLProcessingException;
import org.w3c.dom.Document;
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=374283&r1=374282&r2=374283&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 Wed Feb 1 22:22:09 2006
@@ -89,14 +89,12 @@
private void loadClassPathModules() {
String classPath = getLocation();
- System.out.println("classpath1" + classPath);
int lstindex = classPath.lastIndexOf(File.separatorChar);
if (lstindex > 0) {
classPath = classPath.substring(0, lstindex);
} else {
classPath = ".";
}
- System.out.println("classptah = " + classPath);
File root = new File(classPath);
File[] files = root.listFiles();
if (files != null) {
@@ -106,7 +104,6 @@
if (ArchiveFileData.isModuleArchiveFile(file.getName())) {
//adding moduls in the class path
wsInfoList.addWSInfoItem(file, TYPE_MODULE);
- System.out.println("added a module: " + file.getName());
}
}
}
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=374283&r1=374282&r2=374283&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 Wed Feb 1 22:22:09 2006
@@ -69,7 +69,7 @@
private String moduleDescription;
private String[] supportedPolicyNames;
-
+
/**
* Constructor ModuleDescription.
*/
@@ -254,13 +254,13 @@
public void setModuleDescription(String moduleDescription) {
this.moduleDescription = moduleDescription;
}
-
+
public String[] getSupportedPolicyNamespaces() {
- return supportedPolicyNames;
+ return supportedPolicyNames;
}
-
+
public void setSupportedPolicyNamespaces(String[] supportedPolicyNamespaces) {
- this.supportedPolicyNames = supportedPolicyNamespaces;
+ this.supportedPolicyNames = supportedPolicyNamespaces;
}
public String getFileName() {
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=374283&r1=374282&r2=374283&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 Wed Feb 1 22:22:09 2006
@@ -23,6 +23,7 @@
*/
public class AxisOperationFactory implements WSDLConstants {
+
public static AxisOperation getAxisOperation(int mepURI) throws AxisFault {
AxisOperation abOpdesc;
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=374283&r1=374282&r2=374283&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 Feb 1 22:22:09 2006
@@ -202,7 +202,7 @@
throw new Exception("repository directory " + file.getAbsolutePath()
+ " does not exists");
}
- File axis2xml = new File(file, "axis2.xml");
+ File axis2xml = new File(file, "axis.xml");
String axis2xmlString = null;
if (axis2xml.exists()) {
axis2xmlString = axis2xml.getName();
@@ -281,8 +281,12 @@
}
public static boolean isLatest(String moduleVersion, String currentDefaultVersion) {
- float m_version = Float.parseFloat(moduleVersion);
- float m_c_vresion = Float.parseFloat(currentDefaultVersion);
- return m_version > m_c_vresion;
+ if ("SNAPSHOT".equals(moduleVersion)) {
+ return true;
+ } else {
+ float m_version = Float.parseFloat(moduleVersion);
+ float m_c_vresion = Float.parseFloat(currentDefaultVersion);
+ return m_version > m_c_vresion;
+ }
}
}