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 gd...@apache.org on 2007/06/29 23:59:19 UTC
svn commit: r552044 - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
kernel/src/org/apache/axis2/deployment/
kernel/src/org/apache/axis2/deployment/repository/util/
kernel/src/org/apache/axis2/description...
Author: gdaniels
Date: Fri Jun 29 14:59:18 2007
New Revision: 552044
URL: http://svn.apache.org/viewvc?view=rev&rev=552044
Log:
Accept both dotted (".jar") and undotted ("jar") values for the extension attribute of custom deployers. The dot is really redundant, since we're using lastIndexOf('.') to find the beginning of the extension anyway - it's pretty silly to force devs to type it, so now (again) they don't have to. If we find one with a leading dot, we strip it and go on.
Also a few other bits of cleanup.
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java?view=diff&rev=552044&r1=552043&r2=552044
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java Fri Jun 29 14:59:18 2007
@@ -32,6 +32,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.handlers.AbstractHandler;
+import javax.xml.namespace.QName;
import java.util.Iterator;
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=552044&r1=552043&r2=552044
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Fri Jun 29 14:59:18 2007
@@ -258,6 +258,11 @@
log.error("Deployer missing 'extension' attribute : " + element.toString());
return;
}
+
+ // A leading dot is redundant, so strip it. So we allow either ".foo" or "foo", either
+ // of which will result in extension="foo"
+ if (extension.charAt(0) == '.') extension = extension.substring(1);
+
String deployerClassName = element.getAttributeValue(new QName(TAG_CLASS_NAME));
Deployer deployer;
try {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?view=diff&rev=552044&r1=552043&r2=552044
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Fri Jun 29 14:59:18 2007
@@ -67,7 +67,7 @@
try {
threadClassLoader = Thread.currentThread().getContextClassLoader();
String extension = DeploymentFileData.getFileExtension(deploymentFileData.getName());
- if (".class".equals(extension)) {
+ if ("class".equals(extension)) {
File file = deploymentFileData.getFile();
File parentFile = file.getParentFile();
if (file != null) {
@@ -139,7 +139,7 @@
}
}
- } else if (".jar".equals(extension)) {
+ } else if ("jar".equals(extension)) {
ArrayList classList;
FileInputStream fin = null;
ZipInputStream zin = null;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=552044&r1=552043&r2=552044
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Fri Jun 29 14:59:18 2007
@@ -248,7 +248,8 @@
if (!file.isDirectory() && extension.equals(
DeploymentFileData.getFileExtension(file.getName()))) {
addFileToDeploy(file,
- deploymentEngine.getDeployerForExtension(extension),WSInfo.TYPE_CUSTOM);
+ deploymentEngine.getDeployerForExtension(extension),
+ WSInfo.TYPE_CUSTOM);
}
}
}
@@ -271,19 +272,21 @@
}
if (!file.isDirectory()) {
if (DeploymentFileData.isServiceArchiveFile(file.getName())) {
- addFileToDeploy(file, deploymentEngine.getServiceDeployer(),WSInfo.TYPE_SERVICE);
+ addFileToDeploy(file, deploymentEngine.getServiceDeployer(),
+ WSInfo.TYPE_SERVICE);
} else {
String ext = DeploymentFileData.getFileExtension(file.getName());
Deployer deployer = deploymentEngine.getDeployerForExtension(ext);
// If we found a deployer for this type of file, use it. Otherwise
// ignore the file.
if (deployer != null) {
- addFileToDeploy(file, deployer,WSInfo.TYPE_SERVICE);
+ addFileToDeploy(file, deployer, WSInfo.TYPE_SERVICE);
}
}
} else {
if (!"lib".equalsIgnoreCase(file.getName())) {
- addFileToDeploy(file, deploymentEngine.getServiceDeployer(),WSInfo.TYPE_CUSTOM);
+ addFileToDeploy(file, deploymentEngine.getServiceDeployer(),
+ WSInfo.TYPE_CUSTOM);
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java?view=diff&rev=552044&r1=552043&r2=552044
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java Fri Jun 29 14:59:18 2007
@@ -96,7 +96,7 @@
public static String getFileExtension(String fileName) {
int index = fileName.lastIndexOf('.');
- return fileName.substring(index);
+ return fileName.substring(index + 1);
}
public void setClassLoader(ClassLoader classLoader) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=552044&r1=552043&r2=552044
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Fri Jun 29 14:59:18 2007
@@ -362,8 +362,6 @@
*/
protected MessageContext send(MessageContext msgctx) throws AxisFault {
- AxisEngine engine = new AxisEngine(msgctx.getConfigurationContext());
-
// create the responseMessageContext
MessageContext responseMessageContext =
@@ -377,7 +375,7 @@
axisOp.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE));
//sending the message
- engine.send(msgctx);
+ AxisEngine.send(msgctx);
responseMessageContext.setDoingREST(msgctx.isDoingREST());
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?view=diff&rev=552044&r1=552043&r2=552044
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Fri Jun 29 14:59:18 2007
@@ -486,14 +486,14 @@
soapFaultCode = ("".equals(soapFaultCode) || (soapFaultCode == null))
? getSenderFaultCode(context.getEnvelope().getNamespace())
: soapFaultCode;
- if(context.isSOAP11()) {
+ if (context.isSOAP11()) {
fault.getCode().setText(soapFaultCode);
} else {
fault.getCode().getValue().setText(soapFaultCode);
}
}
- if(faultCode == null && !context.isSOAP11()){
+ if (faultCode == null && !context.isSOAP11()) {
fault.getCode().getValue().setText(soapFaultCode);
}
SOAPFaultReason faultReason = (SOAPFaultReason)context.getProperty(
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java?view=diff&rev=552044&r1=552043&r2=552044
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java Fri Jun 29 14:59:18 2007
@@ -32,7 +32,7 @@
// OK, let's see what we've got here...
assertTrue("Init was not called", CustomDeployer.initCalled);
assertEquals("Wrong directory", "widgets", CustomDeployer.directory);
- assertEquals("Wrong extension", ".svc", CustomDeployer.extension);
+ assertEquals("Wrong extension", "svc", CustomDeployer.extension);
assertEquals("Wrong number of deployed items", 2, CustomDeployer.deployedItems);
assertTrue("George wasn't found", CustomDeployer.georgeDeployed);
assertTrue("Mary wasn't found", CustomDeployer.maryDeployed);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org