svn commit: r916623 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java
Author: isurues
Date: Fri Feb 26 08:58:15 2010
New Revision: 916623
URL: http://svn.apache.org/viewvc?rev=916623&view=rev
Log:
removing @Override annotation
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java?rev=916623&r1=916622&r2=916623&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/AsyncHandlerProxyFactoryImpl.java
Fri Feb 26 08:58:15 2010
@@ -29,7 +29,6 @@
*/
public class AsyncHandlerProxyFactoryImpl implements AsyncHandlerProxyFactory {
-@Override
public AsyncHandler createAsyncHandlerProxy(AsyncHandler ah) throws
Exception {
return ah;
}
svn commit: r918401 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Author: isurues
Date: Wed Mar 3 11:00:45 2010
New Revision: 918401
URL: http://svn.apache.org/viewvc?rev=918401&view=rev
Log:
It is possible to deply services without a version in axis2. therefore Version
instance can be null in this method. Fixing a possible NPE
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=918401&r1=918400&r2=918401&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Wed Mar 3 11:00:45 2010
@@ -294,7 +294,11 @@
* @param moduleVersion the version of the module to remove
*/
public void removeModule(String moduleName, Version moduleVersion) {
-removeModule(moduleName, moduleVersion.toString());
+String version = null;
+if (moduleVersion != null) {
+version = moduleVersion.toString();
+}
+removeModule(moduleName, version);
}
/**
svn commit: r927352 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
Author: isurues
Date: Thu Mar 25 11:35:33 2010
New Revision: 927352
URL: http://svn.apache.org/viewvc?rev=927352&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4417
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java?rev=927352&r1=927351&r2=927352&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
Thu Mar 25 11:35:33 2010
@@ -307,7 +307,8 @@ public class MethodMarshallerUtils {
context.setProcessType(unmarshalByJavaType[i]);
context.setIsxmlList(pd.isListType());
}
-
+
+boolean consume = true;
// Unmarshal the object into a JAXB object or JAXBElement
if (pd.isHeader()) {
@@ -319,6 +320,7 @@ public class MethodMarshallerUtils {
localName,
context,
factory);
+consume = false;
} else {
if (totalBodyBlocks > 1) {
// You must use this method if there are more than
one body block
@@ -332,7 +334,7 @@ public class MethodMarshallerUtils {
index++;
}
-Element element = new
Element(block.getBusinessObject(true),
+Element element = new
Element(block.getBusinessObject(consume),
block.getQName());
PDElement pde =
new PDElement(pd, element, unmarshalByJavaType == null
? null
svn commit: r986198 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment: ServiceDeployer.java util/Utils.java
Author: isurues
Date: Tue Aug 17 06:10:09 2010
New Revision: 986198
URL: http://svn.apache.org/viewvc?rev=986198&view=rev
Log:
fixing an issue related to hierarchical services on Windows
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?rev=986198&r1=986197&r2=986198&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
Tue Aug 17 06:10:09 2010
@@ -179,7 +179,11 @@ public class ServiceDeployer extends Abs
String serviceHierarchy = Utils.getServiceHierarchy(fileName,
this.directory);
fileName = Utils.getShortFileName(fileName);
fileName = DeploymentEngine.getAxisServiceName(fileName);
-fileName = serviceHierarchy + fileName;
+
+//attach the hierarchical part if it is not null
+if (serviceHierarchy != null) {
+fileName = serviceHierarchy + fileName;
+}
AxisServiceGroup serviceGroup =
axisConfig.removeServiceGroup(fileName);
if (serviceGroup != null) {
configCtx.removeServiceGroupContext(serviceGroup);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=986198&r1=986197&r2=986198&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Tue Aug 17 06:10:09 2010
@@ -1885,6 +1885,7 @@ public class Utils {
if (filePath == null || serviceDir == null) {
return "";
}
+filePath = formatPath(filePath);
String[] splited = filePath.split("/" + serviceDir + "/");
String serviceHierarchy = null;
if (splited.length > 1) {
@@ -1903,6 +1904,19 @@ public class Utils {
}
/**
+ * Format the string paths to match any platform.. windows, linux etc..
+ *
+ * @param path - input file path
+ * @return formatted file path
+ */
+public static String formatPath(String path) {
+// removing white spaces
+path = path.replaceAll("\\b\\s+\\b", "%20");
+// replacing all "\" with "/"
+return path.replace('\\', '/');
+}
+
+/**
* Get the class name from a resource name referring to a class file.
*
* @param resourceName the resource name
svn commit: r991441 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Author: isurues
Date: Wed Sep 1 05:47:27 2010
New Revision: 991441
URL: http://svn.apache.org/viewvc?rev=991441&view=rev
Log:
changing the http prefix from http to http1. This is because, use of http as a
prefix causes conflicts with actual URLs like http://foo.com
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java?rev=991441&r1=991440&r2=991441&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Wed Sep 1 05:47:27 2010
@@ -45,7 +45,7 @@ public interface Java2WSDLConstants {
String HTTP_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/http/";;
String MIME_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/mime/";;
-String HTTP_PREFIX = "http";
+String HTTP_PREFIX = "http1";
String MIME_PREFIX = "mime";
String URN_PREFIX = "urn";
String COLON_SEPARATOR = ":";
svn commit: r998857 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Author: isurues
Date: Mon Sep 20 09:50:07 2010
New Revision: 998857
URL: http://svn.apache.org/viewvc?rev=998857&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4475
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=998857&r1=998856&r2=998857&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Mon Sep 20 09:50:07 2010
@@ -154,7 +154,11 @@ public class AxisService2WSDL11 implemen
String prefix =
WSDLSerializationUtil.getPrefix(axisService.getTargetNamespace(),
namespaceMap);
if (prefix == null || "".equals(prefix)) {
- prefix = DEFAULT_TARGET_NAMESPACE_PREFIX;
+if (axisService.getTargetNamespacePrefix() != null) {
+prefix = axisService.getTargetNamespacePrefix();
+} else {
+prefix = DEFAULT_TARGET_NAMESPACE_PREFIX;
+}
}
namespaceMap.put(prefix, axisService.getTargetNamespace());
svn commit: r1003032 - /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
Author: isurues
Date: Thu Sep 30 12:20:20 2010
New Revision: 1003032
URL: http://svn.apache.org/viewvc?rev=1003032&view=rev
Log:
Setting an ExtensionRegistry into WSDLReader instance to properly indicate that
the needed return type for the wsaw:Action extension attribute is a String..
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=1003032&r1=1003031&r2=1003032&view=diff
==
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
Thu Sep 30 12:20:20 2010
@@ -20,6 +20,7 @@
package org.apache.axis2.wsdl.codegen;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.description.WSDL11ToAllAxisServicesBuilder;
import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
import org.apache.axis2.description.WSDL20ToAllAxisServicesBuilder;
@@ -37,6 +38,10 @@ import org.apache.commons.logging.LogFac
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
+import javax.wsdl.Output;
+import javax.wsdl.Input;
+import javax.wsdl.extensions.AttributeExtensible;
+import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
@@ -285,6 +290,16 @@ public class CodeGenerationEngine {
WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
reader.setFeature("javax.wsdl.importDocuments", true);
+
+ExtensionRegistry extReg =
WSDLFactory.newInstance().newPopulatedExtensionRegistry();
+extReg.registerExtensionAttributeType(Input.class,
+new QName(AddressingConstants.Final.WSAW_NAMESPACE,
AddressingConstants.WSA_ACTION),
+AttributeExtensible.STRING_TYPE);
+extReg.registerExtensionAttributeType(Output.class,
+new QName(AddressingConstants.Final.WSAW_NAMESPACE,
AddressingConstants.WSA_ACTION),
+AttributeExtensible.STRING_TYPE);
+reader.setExtensionRegistry(extReg);
+
return reader.readWSDL(uri);
}
svn commit: r1003033 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Author: isurues
Date: Thu Sep 30 12:21:15 2010
New Revision: 1003033
URL: http://svn.apache.org/viewvc?rev=1003033&view=rev
Log:
reverting the workaround
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java?rev=1003033&r1=1003032&r2=1003033&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Thu Sep 30 12:21:15 2010
@@ -45,7 +45,7 @@ public interface Java2WSDLConstants {
String HTTP_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/http/";;
String MIME_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/mime/";;
-String HTTP_PREFIX = "http1";
+String HTTP_PREFIX = "http";
String MIME_PREFIX = "mime";
String URN_PREFIX = "urn";
String COLON_SEPARATOR = ":";
svn commit: r1004248 - /axis/axis2/java/core/trunk/modules/parent/pom.xml
Author: isurues Date: Mon Oct 4 14:25:35 2010 New Revision: 1004248 URL: http://svn.apache.org/viewvc?rev=1004248&view=rev Log: changing the xmlschema version to 1.4.7 which was released few days back Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1004248&r1=1004247&r2=1004248&view=diff == --- axis/axis2/java/core/trunk/modules/parent/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/parent/pom.xml Mon Oct 4 14:25:35 2010 @@ -69,10 +69,10 @@ 1.2.10-SNAPSHOT 3.0.0-SNAPSHOT -1.4.7-SNAPSHOT 1.0-SNAPSHOT +1.4.7 1.7.0 2.7.7 2.4.0
svn commit: r1006200 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Author: isurues
Date: Sat Oct 9 17:41:41 2010
New Revision: 1006200
URL: http://svn.apache.org/viewvc?rev=1006200&view=rev
Log:
In these 3 notifyObservers methods, a Throwable is cought and just ignored only
by adding a debug log. Correcting it by adding an error log.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=1006200&r1=1006199&r2=1006200&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Sat Oct 9 17:41:41 2010
@@ -647,8 +647,8 @@ public class AxisConfiguration extends A
try {
observer.serviceUpdate(event, service);
} catch (Throwable e) {
-// No need to stop the system due to this, so log and ignore
-log.debug(e);
+// No need to stop the system due to this, so log an error and
ignore
+log.error("Error occured while notifying observer", e);
}
}
}
@@ -660,8 +660,8 @@ public class AxisConfiguration extends A
try {
anObserversList.moduleUpdate(event, moule);
} catch (Throwable e) {
-// No need to stop the system due to this, so log and ignore
-log.debug(e);
+// No need to stop the system due to this, so log an error and
ignore
+log.error("Error occured while notifying observer", e);
}
}
}
@@ -673,8 +673,8 @@ public class AxisConfiguration extends A
try {
anObserversList.serviceGroupUpdate(event, serviceGroup);
} catch (Throwable e) {
-// No need to stop the system due to this, so log and ignore
-log.debug(e);
+// No need to stop the system due to this, so log an error and
ignore
+log.error("Error occured while notifying observer", e);
}
}
}
svn commit: r1030868 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Author: isurues
Date: Thu Nov 4 09:34:28 2010
New Revision: 1030868
URL: http://svn.apache.org/viewvc?rev=1030868&view=rev
Log:
When searching for services in deployment folders, we have to skip hidden
folders which starts with '.'. we have done this for aar services in method
findServicesInDirectory. But we haven't done it for other deployment folders.
fixed it..
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?rev=1030868&r1=1030867&r2=1030868&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Thu Nov 4 09:34:28 2010
@@ -301,7 +301,7 @@ public class RepositoryListener implemen
Deployer deployer =
deploymentEngine.getDeployer(dir, extension);
deployer.setDirectory(dir);
addFileToDeploy(file, deployer,
WSInfo.TYPE_CUSTOM);
-} else if (file.isDirectory()) {
+} else if (file.isDirectory() &&
!file.getName().startsWith(".")) {
//look in the child directory also
findFileForGivenDirectory(file, extension, dir);
}
svn commit: r1055748 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Author: isurues
Date: Thu Jan 6 04:54:30 2011
New Revision: 1055748
URL: http://svn.apache.org/viewvc?rev=1055748&view=rev
Log:
removing the logic to detect undeployable folders in the deployer which has
become outdated with the hierarchical services model. That is because, it
searches recursively for services..
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?rev=1055748&r1=1055747&r2=1055748&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Thu Jan 6 04:54:30 2011
@@ -314,7 +314,7 @@ public class RepositoryListener implemen
}
/**
- * Searches a given folder for jar files and adds them to a list in the
WSInfolist class.
+ * Searches a given folder for aar files and adds them to a list in the
WSInfolist class.
* If sub folders found, those are also searched for services.
* Ex : repository/services/foo/1.0.0/echo.aar
* repository/services/foo/1.0.1/echo.aar
@@ -330,11 +330,6 @@ public class RepositoryListener implemen
File[] files = root.listFiles();
if (files != null && files.length > 0) {
-/**
- * This undeployableDir flag is used to check whether this folder
(root) doesn't contain
- * any deployable artifacts.
- */
-boolean undeployableDir = true;
for (File file : files) {
if (isSourceControlDir(file)) {
continue;
@@ -353,13 +348,11 @@ public class RepositoryListener implemen
} else {
findServicesInDirectory(file);
}
-undeployableDir = false;
}
} else {
if
(DeploymentFileData.isServiceArchiveFile(file.getName())) {
addFileToDeploy(file,
deploymentEngine.getServiceDeployer(),
WSInfo.TYPE_SERVICE);
-undeployableDir = false;
} else {
String ext =
DeploymentFileData.getFileExtension(file.getName());
Deployer deployer =
deploymentEngine.getDeployerForExtension(ext);
@@ -368,15 +361,10 @@ public class RepositoryListener implemen
if (deployer != null) {
deployer.setDirectory(deploymentEngine.getServicesDir().getName());
addFileToDeploy(file, deployer,
WSInfo.TYPE_SERVICE);
-undeployableDir = false;
}
}
}
}
-if (!servicesDir && undeployableDir) {
-
log.error(Messages.getMessage(DeploymentErrorMsgs.SERVICE_XML_NOT_FOUND,
-root.getName()));
-}
}
}
svn commit: r1055772 - in /axis/axis2/java/core/trunk/modules/kernel: src/org/apache/axis2/deployment/ test/org/apache/axis2/deployment/
Author: isurues
Date: Thu Jan 6 07:24:25 2011
New Revision: 1055772
URL: http://svn.apache.org/viewvc?rev=1055772&view=rev
Log:
Fixing https://issues.apache.org/jira/browse/AXIS2-4101. Removed support for
other extensions inside the repository/services folder. This is beacuese, we
can't select the correct deployer only by looking at the file extension. And
also, removed unwanted map in DeploymentEngine which keeps a 1 to 1 mapping
(which is no longer valid) between the extension and the deployer. Changed a
test case also to match the change..
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/CustomDeployerTest.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=1055772&r1=1055771&r2=1055772&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
Thu Jan 6 07:24:25 2011
@@ -386,7 +386,6 @@ public class AxisConfigBuilder extends D
}
private void processDeployers(Iterator deployerItr) {
-HashMap extensionToDeployerMappingMap = new HashMap();
Map> deployers = new HashMap>();
while (deployerItr.hasNext()) {
OMElement element = (OMElement) deployerItr.next();
@@ -429,10 +428,8 @@ public class AxisConfigBuilder extends D
deployers.put(directory, extensionMap);
}
extensionMap.put(extension, deployer);
-extensionToDeployerMappingMap.put(extension, deployer);
}
if (deploymentEngine != null) {
-
deploymentEngine.setExtensionToDeployerMappingMap(extensionToDeployerMappingMap);
deploymentEngine.setDeployers(deployers);
}
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=1055772&r1=1055771&r2=1055772&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Thu Jan 6 07:24:25 2011
@@ -134,10 +134,6 @@ public abstract class DeploymentEngine i
//To deploy modules (both mar and expanded)
protected ModuleDeployer moduleDeployer;
-//to keep map of which deployer can process which file extension ,
-// for example ServiceDeployer will process .aar file
-private HashMap extensionToDeployerMappingMap = new HashMap();
-
private Map> deployerMap = new
HashMap>();
private Lock lock = new ReentrantLock();
@@ -1343,10 +1339,6 @@ public abstract class DeploymentEngine i
return repositoryDir;
}
-public void setExtensionToDeployerMappingMap(HashMap
extensionToDeployerMappingMap) {
-this.extensionToDeployerMappingMap = extensionToDeployerMappingMap;
-}
-
public void setDeployers(Map> deployerMap) {
this.deployerMap = deployerMap;
}
@@ -1373,10 +1365,6 @@ public abstract class DeploymentEngine i
return (extensionMap != null) ? extensionMap.get(extension) : null;
}
-public Deployer getDeployerForExtension(String extension) {
-return (Deployer) extensionToDeployerMappingMap.get(extension);
-}
-
/**
* Clean up the mess
*/
@@ -1450,7 +1438,6 @@ public abstract class DeploymentEngine i
deployerMap.put(directory, extensionMap);
}
extensionMap.put(extension, deployer);
-extensionToDeployerMappingMap.put(extension, deployer);
} finally {
lock.unlock();
}
@@ -1492,10 +1479,6 @@ public abstract class DeploymentEngine i
log.debug("Deployer " + deployer.getClass().getName() + "
is removed");
}
}
-
-if (extensionToDeployerMappingMap.containsKey(extension)) {
-extensionToDeployerMappingMap.remove(extension);
-}
} finally {
lock.unlock();
}
Modified:
axis/
svn commit: r1057198 - /axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java
Author: isurues
Date: Mon Jan 10 14:03:41 2011
New Revision: 1057198
URL: http://svn.apache.org/viewvc?rev=1057198&view=rev
Log:
committing an improvement proposed in
https://issues.apache.org/jira/browse/AXIS2-4731
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java?rev=1057198&r1=1057197&r2=1057198&view=diff
==
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java
Mon Jan 10 14:03:41 2011
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
+import java.io.BufferedReader;
/**
* JSONDataSource keeps the JSON String inside and consumes it when needed.
This is to be kept in
@@ -169,12 +170,13 @@ public abstract class AbstractJSONDataSo
return jsonString;
} else {
try {
-char temp = (char)jsonReader.read();
-// use a buffer to support long json strings better..
-StringBuilder sb = new StringBuilder(100);
-while ((int)temp != 65535) {
-sb.append(temp);
-temp = (char)jsonReader.read();
+BufferedReader br = new BufferedReader(jsonReader);
+StringBuilder sb = new StringBuilder(512);
+char[] tempBuf = new char[512];
+int readLen;
+
+while((readLen = br.read(tempBuf)) != -1) {
+sb.append(tempBuf, 0, readLen);
}
jsonString = sb.toString();
} catch (IOException e) {
svn commit: r1059488 - in /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter: JavaClassToDBCConverter.java JavaMethodsToMDCConverter.java
Author: isurues
Date: Sun Jan 16 05:17:06 2011
New Revision: 1059488
URL: http://svn.apache.org/viewvc?rev=1059488&view=rev
Log:
Fixing https://issues.apache.org/jira/browse/AXIS2-4927. There is no partName
method in both RequestWrapper and ResponseWrapper interfaces. And also there is
no messageName method in WebFault interface. Therefore removing those method
calls.
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java?rev=1059488&r1=1059487&r2=1059488&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
Sun Jan 16 05:17:06 2011
@@ -381,7 +381,6 @@ public class JavaClassToDBCConverter {
webFaultAnnot.setFaultBean(webFault.faultBean());
webFaultAnnot.setName(webFault.name());
webFaultAnnot.setTargetNamespace(webFault.targetNamespace());
-webFaultAnnot.setMessageName(webFault.messageName());
composite.setWebFaultAnnot(webFaultAnnot);
}
}
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java?rev=1059488&r1=1059487&r2=1059488&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Sun Jan 16 05:17:06 2011
@@ -199,7 +199,6 @@ public class JavaMethodsToMDCConverter {
rwAnnot.setClassName(requestWrapper.className());
rwAnnot.setLocalName(requestWrapper.localName());
rwAnnot.setTargetNamespace(requestWrapper.targetNamespace());
-rwAnnot.setPartName(requestWrapper.partName());
mdc.setRequestWrapperAnnot(rwAnnot);
}
}
@@ -220,7 +219,6 @@ public class JavaMethodsToMDCConverter {
rwAnnot.setClassName(responseWrapper.className());
rwAnnot.setLocalName(responseWrapper.localName());
rwAnnot.setTargetNamespace(responseWrapper.targetNamespace());
-rwAnnot.setPartName(responseWrapper.partName());
mdc.setResponseWrapperAnnot(rwAnnot);
}
}
svn commit: r1059489 - in /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter: JavaClassToDBCConverter.java JavaMethodsToMDCConverter.java
Author: isurues
Date: Sun Jan 16 05:32:15 2011
New Revision: 1059489
URL: http://svn.apache.org/viewvc?rev=1059489&view=rev
Log:
reverting my previous commit due to a test failure. will fix everything and
commit it back
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java?rev=1059489&r1=1059488&r2=1059489&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
Sun Jan 16 05:32:15 2011
@@ -381,6 +381,7 @@ public class JavaClassToDBCConverter {
webFaultAnnot.setFaultBean(webFault.faultBean());
webFaultAnnot.setName(webFault.name());
webFaultAnnot.setTargetNamespace(webFault.targetNamespace());
+webFaultAnnot.setMessageName(webFault.messageName());
composite.setWebFaultAnnot(webFaultAnnot);
}
}
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java?rev=1059489&r1=1059488&r2=1059489&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Sun Jan 16 05:32:15 2011
@@ -199,6 +199,7 @@ public class JavaMethodsToMDCConverter {
rwAnnot.setClassName(requestWrapper.className());
rwAnnot.setLocalName(requestWrapper.localName());
rwAnnot.setTargetNamespace(requestWrapper.targetNamespace());
+rwAnnot.setPartName(requestWrapper.partName());
mdc.setRequestWrapperAnnot(rwAnnot);
}
}
@@ -219,6 +220,7 @@ public class JavaMethodsToMDCConverter {
rwAnnot.setClassName(responseWrapper.className());
rwAnnot.setLocalName(responseWrapper.localName());
rwAnnot.setTargetNamespace(responseWrapper.targetNamespace());
+rwAnnot.setPartName(responseWrapper.partName());
mdc.setResponseWrapperAnnot(rwAnnot);
}
}
svn commit: r1059975 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Author: isurues
Date: Mon Jan 17 16:23:21 2011
New Revision: 1059975
URL: http://svn.apache.org/viewvc?rev=1059975&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4044
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java?rev=1059975&r1=1059974&r2=1059975&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaMethodsToMDCConverter.java
Mon Jan 17 16:23:21 2011
@@ -28,6 +28,7 @@ import org.apache.axis2.jaxws.descriptio
import org.apache.axis2.jaxws.description.builder.WebEndpointAnnot;
import org.apache.axis2.jaxws.description.builder.WebMethodAnnot;
import org.apache.axis2.jaxws.description.builder.WebResultAnnot;
+import sun.reflect.generics.reflectiveObjects.GenericArrayTypeImpl;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -346,8 +347,10 @@ public class JavaMethodsToMDCConverter {
mdc.setReturnType(fullType);
} else if (type instanceof Class) {
mdc.setReturnType(((Class)type).getName());
- }
- }
+} else if (type instanceof GenericArrayTypeImpl) {
+mdc.setReturnType(type.getClass().getName());
+}
+}
private void setIsListType(MethodDescriptionComposite mdc, Method method) {
mdc.setIsListType(ConverterUtils.hasXmlListAnnotation(method.getAnnotations()));
svn commit: r1060199 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Author: isurues
Date: Tue Jan 18 05:56:55 2011
New Revision: 1060199
URL: http://svn.apache.org/viewvc?rev=1060199&view=rev
Log:
Exception handling improvement. In the previous implementation, the stack trace
of the original exception will be lost. Therefore, adding it into the error log.
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=1060199&r1=1060198&r2=1060199&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Tue Jan 18 05:56:55 2011
@@ -190,7 +190,7 @@ public class JAXWSRIWSDLGenerator implem
catch (Throwable t) {
String msg =
"Error occurred generating WSDL file for Web service
implementation class " +
-"{" + className + "}: {" + t + "}";
+"{" + className + "}";
log.error(msg, t);
throw new WebServiceException(msg, t);
}
@@ -258,14 +258,14 @@ public class JAXWSRIWSDLGenerator implem
}
catch (WSDLException e) {
String msg = "Error occurred while attempting to create
Definition from " +
-"generated WSDL file {" + wsdlFile.getName() + "}:
{" + e + "}";
-log.error(msg);
+"generated WSDL file {" + wsdlFile.getName() + "}";
+log.error(msg, e);
throw new Exception(msg);
}
catch (IOException e) {
String msg = "Error occurred while attempting to create
Definition from " +
-"generated WSDL file {" + wsdlFile.getName() +
"}: {" + e + "}";
-log.error(msg);
+"generated WSDL file {" + wsdlFile.getName() +
"}";
+log.error(msg, e);
throw new Exception(msg);
}
}
@@ -332,9 +332,8 @@ public class JAXWSRIWSDLGenerator implem
return docMap;
}
catch (Exception e) {
-String msg =
-"Error occurred while attempting to read generated schema
file {" + e + "}";
-log.error(msg);
+String msg = "Error occurred while attempting to read generated
schema file";
+log.error(msg, e);
throw new Exception(msg);
}
}
svn commit: r1060294 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Author: isurues
Date: Tue Jan 18 10:46:36 2011
New Revision: 1060294
URL: http://svn.apache.org/viewvc?rev=1060294&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4929. Using a unique id when
reading a schema using the SchemaCollection
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=1060294&r1=1060293&r2=1060294&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Tue Jan 18 10:46:36 2011
@@ -39,6 +39,7 @@ 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.w3c.dom.Document;
import org.xml.sax.InputSource;
import javax.servlet.ServletConfig;
@@ -47,6 +48,7 @@ import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.soap.SOAPBinding;
import java.io.ByteArrayOutputStream;
@@ -321,9 +323,18 @@ public class JAXWSRIWSDLGenerator implem
schemaCollection.setBaseUri(new
File(localOutputDirectory).getAbsolutePath());
HashMap docMap = new HashMap();
+
+// Doc factory to read schema files
+DocumentBuilderFactory fac = DocumentBuilderFactory.newInstance();
+fac.setNamespaceAware(true);
+
List schemaFiles = getSchemaFiles(localOutputDirectory);
for (File schemaFile : schemaFiles) {
-XmlSchema doc = schemaCollection.read(new
InputSource(schemaFile.toURL().toString()), null);
+// generate dom document for current schema file
+Document parsedDoc =
fac.newDocumentBuilder().parse(schemaFile.toURL().toString());
+// read the schema through XmlSchema
+XmlSchema doc =
schemaCollection.read(parsedDoc.getDocumentElement(),
+"id-" + System.currentTimeMillis());
if (log.isDebugEnabled()) {
log.debug("Read in schema file: " + schemaFile.getName());
}
svn commit: r1060357 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Author: isurues
Date: Tue Jan 18 13:14:46 2011
New Revision: 1060357
URL: http://svn.apache.org/viewvc?rev=1060357&view=rev
Log:
Using axiom UIDGenerator instead of System.currentTimeMillis() to generate a
unique ID
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=1060357&r1=1060356&r2=1060357&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Tue Jan 18 13:14:46 2011
@@ -19,6 +19,7 @@
package org.apache.axis2.jaxws.description.builder;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.dataretrieval.SchemaSupplier;
@@ -334,7 +335,7 @@ public class JAXWSRIWSDLGenerator implem
Document parsedDoc =
fac.newDocumentBuilder().parse(schemaFile.toURL().toString());
// read the schema through XmlSchema
XmlSchema doc =
schemaCollection.read(parsedDoc.getDocumentElement(),
-"id-" + System.currentTimeMillis());
+UIDGenerator.generateUID());
if (log.isDebugEnabled()) {
log.debug("Read in schema file: " + schemaFile.getName());
}
svn commit: r1060695 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Author: isurues
Date: Wed Jan 19 07:07:36 2011
New Revision: 1060695
URL: http://svn.apache.org/viewvc?rev=1060695&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4932 by attaching the
service name to the folder name
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=1060695&r1=1060694&r2=1060695&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Wed Jan 19 07:07:36 2011
@@ -156,11 +156,11 @@ public class JAXWSRIWSDLGenerator implem
" WsGen classpath: " +
classPath);
}
-String localOutputDirectory = tempFile.getAbsolutePath() + className;
+String localOutputDirectory = tempFile.getAbsolutePath() + className
++ "_" + axisService.getName();
if (log.isDebugEnabled()) {
log.debug("Output directory for generated WSDL file: " +
localOutputDirectory);
}
-boolean errorOnRead = false;
try {
if (log.isDebugEnabled()) {
svn commit: r1061145 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
Author: isurues
Date: Thu Jan 20 07:44:00 2011
New Revision: 1061145
URL: http://svn.apache.org/viewvc?rev=1061145&view=rev
Log:
Fxing https://issues.apache.org/jira/browse/AXIS2-4754. Sending the list of
values for the HTTP header as a comma-separated list
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java?rev=1061145&r1=1061144&r2=1061145&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
Thu Jan 20 07:44:00 2011
@@ -27,6 +27,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -141,8 +142,10 @@ public class TransportHeadersAdapter imp
} else if (o instanceof List) {
return (List) o;
} else if (o instanceof String) {
-List l = new ArrayList();
-l.add(o);
+String s = (String)o;
+String[] values = s.split(", ");
+List l = new ArrayList();
+l.addAll(Arrays.asList(values));
return l;
} else {
throw ExceptionFactory.makeWebServiceException(
@@ -160,8 +163,15 @@ public class TransportHeadersAdapter imp
List l = (List) o;
if (l.size() == 0) {
return null;
-} else if (l.size() == 1) {
-return (String) l.get(0);
+} else {
+String s = "";
+for (int i = 0 ; i < l.size() ; i++) {
+s += l.get(i);
+if (i != l.size() - 1) {
+s += ", ";
+}
+}
+return s;
}
}
throw ExceptionFactory.makeWebServiceException(
@@ -182,7 +192,6 @@ public class TransportHeadersAdapter imp
}
public boolean containsValue(Object value) {
-// TODO Should walk all of the values to do this correctly.
String valueString = convertToString(value);
return getDelegateMap(mc).containsValue(valueString);
}
svn commit: r1061146 - in /axis/axis2/java/core/trunk/modules/jaxws-integration: pom.xml test/org/apache/axis2/jaxws/client/CustomHTTPHeaderTests.java test/org/apache/axis2/jaxws/sample/addnumbers/Add
Author: isurues
Date: Thu Jan 20 07:45:09 2011
New Revision: 1061146
URL: http://svn.apache.org/viewvc?rev=1061146&view=rev
Log:
adding the test case for https://issues.apache.org/jira/browse/AXIS2-4754 into
the build
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/CustomHTTPHeaderTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=1061146&r1=1061145&r2=1061146&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Thu Jan 20
07:45:09 2011
@@ -1326,7 +1326,7 @@
**/SoapMessageProviderTests.java
**/StringProviderTests.java
**/OMProviderTests.java
-
+**/CustomHTTPHeaderTests.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/CustomHTTPHeaderTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/CustomHTTPHeaderTests.java?rev=1061146&r1=1061145&r2=1061146&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/CustomHTTPHeaderTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/CustomHTTPHeaderTests.java
Thu Jan 20 07:45:09 2011
@@ -20,6 +20,7 @@
package org.apache.axis2.jaxws.client;
import java.util.Collections;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -45,7 +46,7 @@ public class CustomHTTPHeaderTests exten
public void testPort() throws Exception {
Map> headers = new HashMap>();
headers.put("MY_HEADER_1", Collections.singletonList("hello"));
-// headers.put("MY_HEADER_2", Arrays.asList("value1", "value2"));
+headers.put("MY_HEADER_2", Arrays.asList("value1", "value2"));
AddNumbersService service = new AddNumbersService();
AddNumbersPortType port = service.getAddNumbersPort();
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java?rev=1061146&r1=1061145&r2=1061146&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersPortTypeImpl.java
Thu Jan 20 07:45:09 2011
@@ -68,18 +68,16 @@ public class AddNumbersPortTypeImpl impl
if (!values.contains("hello")) {
throw new RuntimeException("MY_HEADER_1 HTTP header does
not contain expected value: " + values);
}
-
-/*
+
// test MY_HEADER_2
values = (List) headers.get("MY_HEADER_2");
if (values == null || headers.isEmpty()) {
throw new RuntimeException("No values for MY_HEADER_2 HTTP
header");
}
-if (!values.contains("values1") && !values.contains("values2")) {
+if (!values.contains("value1") && !values.contains("value2")) {
throw new RuntimeException("MY_HEADER_2 HTTP header does not
contain expected values: " + values);
}
-*/
- }
+ }
}
/* (non-Javadoc)
svn commit: r1061180 - in /axis/axis2/java/core/trunk/modules/tool/script: axis2server.bat axis2server.sh
Author: isurues Date: Thu Jan 20 09:36:25 2011 New Revision: 1061180 URL: http://svn.apache.org/viewvc?rev=1061180&view=rev Log: As per https://issues.apache.org/jira/browse/AXIS2-4927, modifying the scripts to support an Axis2 specific endorsed directory Modified: axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh Modified: axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat?rev=1061180&r1=1061179&r2=1061180&view=diff == --- axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat (original) +++ axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat Thu Jan 20 09:36:25 2011 @@ -105,7 +105,7 @@ echo Using JAVA_HOME%JAVA_HOME% echo Using AXIS2_HOME %AXIS2_HOME% cd %AXIS2_HOME% -"%_JAVACMD%" %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.axis2.transport.SimpleAxis2Server %AXIS2_CMD_LINE_ARGS% +"%_JAVACMD%" %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" -Djava.endorsed.dirs="%AXIS2_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed" org.apache.axis2.transport.SimpleAxis2Server %AXIS2_CMD_LINE_ARGS% goto end :end Modified: axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh?rev=1061180&r1=1061179&r2=1061180&view=diff == --- axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh (original) +++ axis/axis2/java/core/trunk/modules/tool/script/axis2server.sh Thu Jan 20 09:36:25 2011 @@ -60,5 +60,7 @@ while [ $# -ge 1 ]; do esac done -java $JAVA_OPTS -classpath "$AXIS2_CLASSPATH" org.apache.axis2.transport.SimpleAxis2Server \ +java $JAVA_OPTS -classpath "$AXIS2_CLASSPATH" \ + -Djava.endorsed.dirs="$AXIS2_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \ +org.apache.axis2.transport.SimpleAxis2Server \ -repo "$AXIS2_HOME"/repository -conf "$AXIS2_HOME"/conf/axis2.xml $*
svn commit: r1061354 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
Author: isurues
Date: Thu Jan 20 15:57:28 2011
New Revision: 1061354
URL: http://svn.apache.org/viewvc?rev=1061354&view=rev
Log:
Fixing the incorrect usage of the outer loop varialbe inside the inner loop
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java?rev=1061354&r1=1061353&r2=1061354&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/builder/converter/JavaClassToDBCConverter.java
Thu Jan 20 15:57:28 2011
@@ -122,7 +122,7 @@ public class JavaClassToDBCConverter {
// Also try to see if the SEI has any super interfaces
Class[] interfaces = seiClass.getInterfaces();
for (int j = 0; j < interfaces.length; j++) {
-buildDBC(dbcMap, interfaces[i]);
+buildDBC(dbcMap, interfaces[j]);
}
}
catch (ClassNotFoundException e) {
svn commit: r1062194 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Author: isurues
Date: Sat Jan 22 16:51:25 2011
New Revision: 1062194
URL: http://svn.apache.org/viewvc?rev=1062194&view=rev
Log:
Fixing https://issues.apache.org/jira/browse/AXIS2-4930. Committing a modified
version of the patch which was given by Kasun. Basically this fix adds the URLs
of the deployment class loader into the current TCCL.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?rev=1062194&r1=1062193&r2=1062194&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Sat Jan 22 16:51:25 2011
@@ -28,13 +28,12 @@ import org.apache.axis2.description.Para
import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.engine.MessageReceiver;
+import org.apache.axis2.java.security.AccessController;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.core.InvocationContextFactory;
import org.apache.axis2.jaxws.core.MessageContext;
import org.apache.axis2.jaxws.core.util.MessageContextUtils;
-
import org.apache.axis2.jaxws.description.EndpointDescription;
-import org.apache.axis2.jaxws.description.ServiceDescription;
import org.apache.axis2.jaxws.handler.AttachmentsAdapter;
import org.apache.axis2.jaxws.handler.MEPContext;
import org.apache.axis2.jaxws.handler.SOAPHeadersAdapter;
@@ -53,6 +52,9 @@ import org.apache.commons.logging.LogFac
import javax.xml.ws.Binding;
import javax.xml.ws.WebServiceException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.PrivilegedAction;
/**
* The JAXWSMessageReceiver is the entry point, from the server's perspective,
to the JAX-WS code.
@@ -82,7 +84,13 @@ public class JAXWSMessageReceiver implem
//Get the name of the service impl that was stored as a parameter
// inside of the services.xml.
AxisService service = axisRequestMsgCtx.getAxisService();
-
+
+// we need to merge the deployment class loader to the TCCL. This is
because, in JAX-WS
+// services, there can be situations where we have to load classes
from the deployment
+// artifact (JAX-WS jar file) in the message flow. Ex: Handler classes
in the service
+// artifact. Adding this as a fix for AXIS2-4930.
+mergeDeploymentCL(service);
+
org.apache.axis2.description.Parameter svcClassParam =
service.getParameter(PARAM_SERVICE_CLASS);
@@ -251,7 +259,52 @@ public class JAXWSMessageReceiver implem
throw faultToReturn;
}
}
-
+
+/**
+ * Merges the deployment class loader to the TCCL. Deployment class loader
is accessed through
+ * the AxisService and a new class loader is created by using URLs from
deployment class loder
+ * and setting the current TCCL as the parent. Finally the new class
loader is set as the TCCL.
+ *
+ * @param service - Current AxisService instance
+ */
+private void mergeDeploymentCL(AxisService service) {
+ClassLoader deploymentClassLoader = service.getClassLoader();
+// get URLs from deployment class loader
+URL[] deploymentClassLoaderUrls = ((URLClassLoader)
deploymentClassLoader).getURLs();
+// create a new class loader by setting the current TCCL as the parent
+setContextClassLoader(new URLClassLoader(deploymentClassLoaderUrls,
+getContextClassLoader()));
+}
+
+/**
+ * Get context class loader of the current thread.
+ *
+ * @return ClassLoader
+ */
+private ClassLoader getContextClassLoader() {
+return (ClassLoader) AccessController.doPrivileged(
+new PrivilegedAction() {
+public Object run() {
+return Thread.currentThread().getContextClassLoader();
+}
+}
+);
+}
+
+/**
+ * Set context class loader of the current thread.
+ *
+ * @param cl the context ClassLoader for the Thread
+ */
+private void setContextClassLoader(final ClassLoader cl) {
+AccessController.doPrivileged(new PrivilegedAction() {
+public Object run() {
+Thread.currentThread().setContextClassLoader(cl);
+return null;
+}
+});
+}
+
private void sendAckBack(org.apache.axis2.context.MessageContext
axisMsgCtx){
if (log.isDebugEnabled()) {
svn commit: r1064552 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
Author: isurues
Date: Fri Jan 28 09:24:56 2011
New Revision: 1064552
URL: http://svn.apache.org/viewvc?rev=1064552&view=rev
Log:
Adding an instanceof check to prevent a possible ClassCastException
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=1064552&r1=1064551&r2=1064552&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
Fri Jan 28 09:24:56 2011
@@ -125,12 +125,15 @@ public class ServiceBuilder extends Desc
Parameter childFirstClassLoading =
service.getParameter(Constants.Configuration.ENABLE_CHILD_FIRST_CLASS_LOADING);
-if (childFirstClassLoading != null){
-DeploymentClassLoader deploymentClassLoader =
(DeploymentClassLoader) service.getClassLoader();
-if
(JavaUtils.isTrueExplicitly(childFirstClassLoading.getValue())){
-deploymentClassLoader.setChildFirstClassLoading(true);
-} else if
(JavaUtils.isFalseExplicitly(childFirstClassLoading.getValue())){
-deploymentClassLoader.setChildFirstClassLoading(false);
+if (childFirstClassLoading != null) {
+ClassLoader cl = service.getClassLoader();
+if (cl instanceof DeploymentClassLoader) {
+DeploymentClassLoader deploymentClassLoader =
(DeploymentClassLoader) cl;
+if
(JavaUtils.isTrueExplicitly(childFirstClassLoading.getValue())){
+deploymentClassLoader.setChildFirstClassLoading(true);
+} else if
(JavaUtils.isFalseExplicitly(childFirstClassLoading.getValue())){
+deploymentClassLoader.setChildFirstClassLoading(false);
+}
}
}
svn commit: r1065629 - /axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl
Author: isurues Date: Mon Jan 31 14:46:25 2011 New Revision: 1065629 URL: http://svn.apache.org/viewvc?rev=1065629&view=rev Log: fixing https://issues.apache.org/jira/browse/AXIS2-4613 Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl?rev=1065629&r1=1065628&r2=1065629&view=diff == --- axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl (original) +++ axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl Mon Jan 31 14:46:25 2011 @@ -63,7 +63,7 @@ - +http://localhost:8080/CalculatorService"/>
svn commit: r1065927 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Author: isurues
Date: Tue Feb 1 06:59:27 2011
New Revision: 1065927
URL: http://svn.apache.org/viewvc?rev=1065927&view=rev
Log:
Minor improvement. adding an instance of check before casting.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?rev=1065927&r1=1065926&r2=1065927&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Tue Feb 1 06:59:27 2011
@@ -269,11 +269,13 @@ public class JAXWSMessageReceiver implem
*/
private void mergeDeploymentCL(AxisService service) {
ClassLoader deploymentClassLoader = service.getClassLoader();
-// get URLs from deployment class loader
-URL[] deploymentClassLoaderUrls = ((URLClassLoader)
deploymentClassLoader).getURLs();
-// create a new class loader by setting the current TCCL as the parent
-setContextClassLoader(new URLClassLoader(deploymentClassLoaderUrls,
-getContextClassLoader()));
+if (deploymentClassLoader instanceof URLClassLoader) {
+// get URLs from deployment class loader
+URL[] deploymentClassLoaderUrls = ((URLClassLoader)
deploymentClassLoader).getURLs();
+// create a new class loader by setting the current TCCL as the
parent
+setContextClassLoader(new URLClassLoader(deploymentClassLoaderUrls,
+getContextClassLoader()));
+}
}
/**
svn commit: r1067399 - in /axis/axis2/java/core/trunk/modules: jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/ jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/
Author: isurues
Date: Sat Feb 5 06:49:45 2011
New Revision: 1067399
URL: http://svn.apache.org/viewvc?rev=1067399&view=rev
Log:
Fixing https://issues.apache.org/jira/browse/AXIS2-2477 and fixing the test
cases which are affected by the service name fix
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/EchoImplNoSEI.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtom/MtomSampleMTOMDefaultService.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtom/MtomSampleMTOMDisable2Service.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtom/MtomSampleMTOMDisableService.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtom/MtomSampleMTOMEnableService.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/mtom/MtomSampleMTOMThresholdService.java
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/client/PortDeserializationTests.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/EchoImplNoSEI.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/EchoImplNoSEI.java?rev=1067399&r1=1067398&r2=1067399&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/EchoImplNoSEI.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/EchoImplNoSEI.java
Sat Feb 5 06:49:45 2011
@@ -24,7 +24,7 @@ import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
-@WebService(name = "EchoNoSEI", serviceName="RPCLitStringArrayService",
targetNamespace = "http://sei.stringarray.rpclit.jaxws.axis2.apache.org";)
+@WebService(name = "EchoNoSEI",
serviceName="RPCLitStringArrayEchoNoSEIService", targetNamespace =
"http://sei.stringarray.rpclit.jaxws.axis2.apache.org";)
@SOAPBinding(style = Style.RPC)
public class EchoImplNoSEI {
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java?rev=1067399&r1=1067398&r2=1067399&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
Sat Feb 5 06:49:45 2011
@@ -77,7 +77,7 @@ public class RPCLitStringArrayTests exte
Echo portType = service.getEchoPort();
BindingProvider p = (BindingProvider) portType;
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-
"http://localhost:6060/axis2/services/RPCLitStringArrayService.EchoNoSEIPort";);
+
"http://localhost:6060/axis2/services/RPCLitStringArrayEchoNoSEIService.EchoNoSEIPort";);
String[] strArray= {"str1", "str2", "str3", "str4 5"};
StringArray array = new StringArray();
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java?rev=1067399&r1=1067398&r2=1067399&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
Sat Feb 5 0
svn commit: r1089432 - /axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Author: isurues
Date: Wed Apr 6 12:50:08 2011
New Revision: 1089432
URL: http://svn.apache.org/viewvc?rev=1089432&view=rev
Log:
When the AxisService for a JAXWS service is created from the generated WSDL,
the endpoint URL is always set to 'REPLACE_WITH_ACTUAL_URL' by the wsgen tool.
When generating WSDL 2.0 for this AxisService, AxisService2WSDL20 doesn't
calculate the proper value if there is an existing value for the Endpoint URL.
Therefore, setting it to null. Proper values will be calculated when the WSDLs
are generated..
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?rev=1089432&r1=1089431&r2=1089432&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Wed Apr 6 12:50:08 2011
@@ -1071,6 +1071,7 @@ public class EndpointDescriptionImpl
// from wsgen. Set the transport for that endpoint as http by
default.
for (AxisEndpoint axisEndpoint :
axisService.getEndpoints().values()) {
axisEndpoint.setTransportInDescription("http");
+axisEndpoint.setEndpointURL(null);
}
} catch (AxisFault e) {
svn commit: r1096134 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Author: isurues
Date: Sat Apr 23 12:05:26 2011
New Revision: 1096134
URL: http://svn.apache.org/viewvc?rev=1096134&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-5009
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=1096134&r1=1096133&r2=1096134&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Sat Apr 23 12:05:26 2011
@@ -1029,12 +1029,14 @@ public abstract class DeploymentEngine i
*/
protected void setClassLoaders(String axis2repoURI) throws
DeploymentException {
ClassLoader sysClassLoader =
-
Utils.getClassLoader(Thread.currentThread().getContextClassLoader(),
axis2repoURI, false);
+
Utils.getClassLoader(Thread.currentThread().getContextClassLoader(),
axis2repoURI,
+axisConfig.isChildFirstClassLoading());
axisConfig.setSystemClassLoader(sysClassLoader);
if (servicesDir.exists()) {
axisConfig.setServiceClassLoader(
-Utils.getClassLoader(axisConfig.getSystemClassLoader(),
servicesDir, axisConfig.isChildFirstClassLoading()));
+Utils.getClassLoader(axisConfig.getSystemClassLoader(),
servicesDir,
+axisConfig.isChildFirstClassLoading()));
} else {
axisConfig.setServiceClassLoader(axisConfig.getSystemClassLoader());
}
svn commit: r1096135 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Author: isurues
Date: Sat Apr 23 12:06:39 2011
New Revision: 1096135
URL: http://svn.apache.org/viewvc?rev=1096135&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-5010
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?rev=1096135&r1=1096134&r2=1096135&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
Sat Apr 23 12:06:39 2011
@@ -301,7 +301,8 @@ public class RepositoryListener implemen
Deployer deployer =
deploymentEngine.getDeployer(dir, extension);
deployer.setDirectory(dir);
addFileToDeploy(file, deployer,
WSInfo.TYPE_CUSTOM);
-} else if (file.isDirectory() &&
!file.getName().startsWith(".")) {
+} else if (file.isDirectory() &&
!file.getName().startsWith(".") &&
+!(dir.equals(directory.getName()) &&
"lib".equalsIgnoreCase(file.getName( {
//look in the child directory also
findFileForGivenDirectory(file, extension, dir);
}
svn commit: r1096136 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Author: isurues
Date: Sat Apr 23 12:07:09 2011
New Revision: 1096136
URL: http://svn.apache.org/viewvc?rev=1096136&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-5011
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1096136&r1=1096135&r2=1096136&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Sat Apr 23 12:07:09 2011
@@ -52,6 +52,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -145,6 +146,10 @@ public class JAXWSDeployer extends Abstr
ArrayList urls = new ArrayList();
urls.add(deploymentFileData.getFile().toURL());
urls.add(axisConfig.getRepository());
+
+// adding libs under jaxws deployment dir
+addJaxwsLibs(urls, axisConfig.getRepository().getPath() +
directory);
+
String webLocation = DeploymentEngine.getWebLocationString();
if (webLocation != null) {
urls.add(new File(webLocation).toURL());
@@ -348,5 +353,31 @@ public class JAXWSDeployer extends Abstr
map.put(key, axisService);
}
}
+
+/**
+ * Checks whether there's a 'lib' folder inside the provided folder and
adds all the lib URLs
+ * into the provided URL list.
+ *
+ * @param urls - list of URLs
+ * @param jaxwsDepDirPath - jaxws deployment folder path
+ * @throws Exception - on error while geting URLs of libs
+ */
+private void addJaxwsLibs(ArrayList urls, String jaxwsDepDirPath)
+throws Exception {
+File jaxwsDepDirLib = new File(jaxwsDepDirPath + File.separator +
"lib");
+if (jaxwsDepDirLib.exists() && jaxwsDepDirLib.isDirectory()) {
+for (File file : jaxwsDepDirLib.listFiles()) {
+if (file.isFile()) {
+try {
+urls.add(file.toURI().toURL());
+} catch (MalformedURLException e) {
+throw new Exception("Error while loading libraries
from the " +
+"'lib' directory under jaxws deployment
direcotry.", e);
+}
+}
+}
+}
+}
+
}
svn commit: r1125705 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Author: isurues
Date: Sat May 21 14:08:53 2011
New Revision: 1125705
URL: http://svn.apache.org/viewvc?rev=1125705&view=rev
Log:
Fixing the incorrect Error message. JAX-WS service deployment can fail due to
many reasons. There can be situations where the service is annotated with
@WebService annotation, but something else has gone wrong. In such situations
existing error message is misleading. Fixed it with a generic error message.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1125705&r1=1125704&r2=1125705&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Sat May 21 14:08:53 2011
@@ -167,9 +167,9 @@ public class JAXWSDeployer extends Abstr
AxisServiceGroup serviceGroup = deployClasses(groupName,
location, classLoader, classList);
if(serviceGroup == null) {
-String msg = "Error:\n No @WebService annotated service
implementations found in the jar: " +
+String msg = "Error while deploying JAX-WS jar: " +
location.toString() +
-". Service deployment failed.";
+". JAX-WS Service deployment failed.";
log.error(msg);
axisConfig.getFaultyServices().
put(deploymentFileData.getFile().getAbsolutePath(), msg);
svn commit: r1130137 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Author: isurues
Date: Wed Jun 1 13:06:31 2011
New Revision: 1130137
URL: http://svn.apache.org/viewvc?rev=1130137&view=rev
Log:
Adding modifyUserWSDLPortAddress parameter for jaxws services by default
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1130137&r1=1130136&r2=1130137&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Wed Jun 1 13:06:31 2011
@@ -276,6 +276,7 @@ public class JAXWSDeployer extends Abstr
axisService.setFileName(serviceLocation);
axisService.setClassLoader(classLoader);
axisService.addParameter(new
Parameter(org.apache.axis2.jaxws.spi.Constants.CACHE_CLASSLOADER, classLoader));
+axisService.addParameter(new
Parameter("modifyUserWSDLPortAddress", "true"));
}
return axisService;
}
svn commit: r1138372 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
Author: isurues
Date: Wed Jun 22 10:03:59 2011
New Revision: 1138372
URL: http://svn.apache.org/viewvc?rev=1138372&view=rev
Log:
Limiting the max thread pool size to 100 as per the thread 'Default ThreadPool
Size' in axis2 dev list
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java?rev=1138372&r1=1138371&r2=1138372&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
Wed Jun 22 10:03:59 2011
@@ -48,7 +48,8 @@ public class ThreadPool implements Threa
//integers that define the pool size, with the default values set.
private int corePoolSize = 5;
-private int maxPoolSize = Integer.MAX_VALUE;
+//max pool size is set to 100 to control the maximum number of threads
created
+private int maxPoolSize = 100;
public ThreadPool() {
setExecutor(createDefaultExecutor("Axis2 Task", Thread.NORM_PRIORITY,
true));
svn commit: r1140510 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Author: isurues
Date: Tue Jun 28 10:17:50 2011
New Revision: 1140510
URL: http://svn.apache.org/viewvc?rev=1140510&view=rev
Log:
createSOAPMessageWithoutSchema method was not consuming all the values for a
particular key. Fixed it..
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1140510&r1=1140509&r2=1140510&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Tue Jun 28 10:17:50 2011
@@ -192,21 +192,18 @@ public class BuilderUtil {
return soapEnvelope;
}
-private static void createSOAPMessageWithoutSchema(SOAPFactory soapFactory,
+public static void createSOAPMessageWithoutSchema(SOAPFactory soapFactory,
OMElement
bodyFirstChild,
MultipleEntryHashMap
requestParameterMap) {
// first add the parameters in the URL
if (requestParameterMap != null) {
-Iterator requestParamMapIter =
requestParameterMap.keySet().iterator();
-while (requestParamMapIter.hasNext()) {
-String key = (String)requestParamMapIter.next();
-Object value = requestParameterMap.get(key);
-if (value != null) {
-addRequestParameter(soapFactory, bodyFirstChild, null, key,
-value);
+for (Object o : requestParameterMap.keySet()) {
+String key = (String) o;
+Object value;
+while ((value = requestParameterMap.get(key)) != null) {
+addRequestParameter(soapFactory, bodyFirstChild, null,
key, value);
}
-
}
}
}
svn commit: r1145456 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
Author: isurues
Date: Tue Jul 12 05:03:53 2011
New Revision: 1145456
URL: http://svn.apache.org/viewvc?rev=1145456&view=rev
Log:
removing an unwanted block to remove the part after '/' from the service name.
this code breaks the hierarchical service scenario.
Modified:
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
Modified:
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java?rev=1145456&r1=1145455&r2=1145456&view=diff
==
---
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
(original)
+++
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
Tue Jul 12 05:03:53 2011
@@ -100,10 +100,6 @@ public abstract class AbstractTransportL
@Override
public EndpointReference[] getEPRsForService(String serviceName, String
ip) throws AxisFault {
-//Strip out the operation name
-if (serviceName.indexOf('/') != -1) {
-serviceName = serviceName.substring(0, serviceName.indexOf('/'));
-}
// strip out the endpoint name if present
if (serviceName.indexOf('.') != -1) {
serviceName = serviceName.substring(0, serviceName.indexOf('.'));
svn commit: r1209034 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Author: isurues
Date: Thu Dec 1 11:14:59 2011
New Revision: 1209034
URL: http://svn.apache.org/viewvc?rev=1209034&view=rev
Log:
Removing unwanted methods after properly fixing AXIS2-4930
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?rev=1209034&r1=1209033&r2=1209034&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
Thu Dec 1 11:14:59 2011
@@ -83,11 +83,11 @@ public class JAXWSMessageReceiver implem
// inside of the services.xml.
AxisService service = axisRequestMsgCtx.getAxisService();
-// we need to merge the deployment class loader to the TCCL. This is
because, in JAX-WS
+// we need to set the deployment class loader as the TCCL. This is
because, in JAX-WS
// services, there can be situations where we have to load classes
from the deployment
// artifact (JAX-WS jar file) in the message flow. Ex: Handler classes
in the service
// artifact. Adding this as a fix for AXIS2-4930.
-mergeDeploymentCL(service);
+setContextClassLoader(service.getClassLoader());
org.apache.axis2.description.Parameter svcClassParam =
service.getParameter(PARAM_SERVICE_CLASS);
@@ -259,41 +259,6 @@ public class JAXWSMessageReceiver implem
}
/**
- * Merges the deployment class loader to the TCCL. Deployment class loader
is accessed through
- * the AxisService and a new class loader is created by using URLs from
deployment class loder
- * and setting the current TCCL as the parent. Finally the new class
loader is set as the TCCL.
- *
- * @param service - Current AxisService instance
- */
-private void mergeDeploymentCL(AxisService service) {
-setContextClassLoader(service.getClassLoader());
-//TODO - need to remove
-//ClassLoader deploymentClassLoader = service.getClassLoader();
-//if (deploymentClassLoader instanceof URLClassLoader) {
-//// get URLs from deployment class loader
-//URL[] deploymentClassLoaderUrls = ((URLClassLoader)
deploymentClassLoader).getURLs();
-//// create a new class loader by setting the current TCCL as the
parent
-//setContextClassLoader(new
URLClassLoader(deploymentClassLoaderUrls,
-//getContextClassLoader()));
-//}
-}
-
-/**
- * Get context class loader of the current thread.
- *
- * @return ClassLoader
- */
-private ClassLoader getContextClassLoader() {
-return (ClassLoader) AccessController.doPrivileged(
-new PrivilegedAction() {
-public Object run() {
-return Thread.currentThread().getContextClassLoader();
-}
-}
-);
-}
-
-/**
* Set context class loader of the current thread.
*
* @param cl the context ClassLoader for the Thread
svn commit: r1336563 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
Author: isurues
Date: Thu May 10 09:40:08 2012
New Revision: 1336563
URL: http://svn.apache.org/viewvc?rev=1336563&view=rev
Log:
Adding a null check for service hierarchy
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?rev=1336563&r1=1336562&r2=1336563&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
Thu May 10 09:40:08 2012
@@ -153,7 +153,7 @@ public class ServiceDeployer extends Abs
if (location != null) {
String serviceHierarchy =
Utils.getServiceHierarchy(location.getPath(),
this.directory);
-if (!"".equals(serviceHierarchy)) {
+if (serviceHierarchy != null && !"".equals(serviceHierarchy)) {
serviceGroup.setServiceGroupName(serviceHierarchy
+ serviceGroup.getServiceGroupName());
for (AxisService axisService : serviceList) {
svn commit: r1605659 - /axis/axis2/java/core/trunk/pom.xml
Author: isurues Date: Thu Jun 26 03:46:01 2014 New Revision: 1605659 URL: http://svn.apache.org/r1605659 Log: Adding myself in the developers list to test my old commit account Modified: axis/axis2/java/core/trunk/pom.xml Modified: axis/axis2/java/core/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1605659&r1=1605658&r2=1605659&view=diff == --- axis/axis2/java/core/trunk/pom.xml (original) +++ axis/axis2/java/core/trunk/pom.xml Thu Jun 26 03:46:01 2014 @@ -518,6 +518,13 @@ http://lk.linkedin.com/pub/shameera-rathnayaka/1a/661/561 WSO2 + +Isuru Suriarachchi + isurues + isurues AT apache.org + https://www.linkedin.com/pub/isuru-suriarachchi/a/58b/b69 +Indiana University +
