[104993] java.lang.NoClassDefFoundError: javax/activation/DataSource.
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
index 0fba3eb..022ed2f 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
@@ -21,13 +21,13 @@
# Messages for Java2WSDLCommand
#
MSG_GENERATE_WSDL=Generating WSDL file: {0}
-MSG_ERROR_JAVA_WSDL_GENERATE=IWAB0398E Error in generating WSDL from Java
+MSG_ERROR_JAVA_WSDL_GENERATE=IWAB0398E Error in generating WSDL from Java:
#
# Messages for WSDL2JavaCommand
#
MSG_PARSING_WSDL=Parsing WSDL file: {0}
-MSG_ERROR_WSDL_JAVA_GENERATE=IWAB0399E Error in generating Java from WSDL
+MSG_ERROR_WSDL_JAVA_GENERATE=IWAB0399E Error in generating Java from WSDL:
MSG_ERROR_MOVE_RESOURCE=IWAB0523E Error moving resource: {0}
MSG_ERROR_CREATE_TEMP_DIR=Error creating temporary directory
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
index beded35..650f9dd 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
@@ -166,7 +166,7 @@
environment.getLog().log(ILog.ERROR, 5018, this, "executeAntTask", e);
status = StatusUtils.errorStatus(
AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_GENERATE + " " //$NON-NLS-1$
- +e.getCause().toString());
+ +e.getCause().toString(), e.getCause());
environment.getStatusHandler().reportError(status);
return status;
} finally {
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
index 499fbd9..9e794ca 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
@@ -171,7 +171,7 @@
environment.getLog().log(ILog.ERROR, 5021, this, "execute", e);
status = StatusUtils.errorStatus(
AxisConsumptionCoreMessages.MSG_ERROR_WSDL_JAVA_GENERATE + " " //$NON-NLS-1$
- + e.toString());
+ + e.toString(), e);
environment.getStatusHandler().reportError(status);
} finally {
deleteDir(tempOutputFile);
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
index c5f1dcb..f794c78 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
@@ -48,11 +48,6 @@
private static String DOT_JAR = ".jar"; //$NON-NLS-1$
private static String JAR = "jar"; //$NON-NLS-1$
private static String WEBINF_LIB = "/WEB-INF/lib"; //$NON-NLS-1$
-
- // workaround for Axis-2146 - lower case list of JARs that may include javax.activation.DataHandler
- private static String[] JARLIST = new String[] {
- "activation.jar"
- };
private ClasspathUtils() {
}
@@ -236,8 +231,7 @@
buildPath[i],
javaProject.getProject());
for (int j = 0; j < buildPathString.length; j++) {
- if (!excludeJar(buildPathString[j]))
- projectClasspath.add(buildPathString[j]);
+ projectClasspath.add(buildPathString[j]);
}
}
} catch (JavaModelException jme) {
@@ -256,19 +250,6 @@
return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
}
- // workaround for Axis-2146 - exclude JARs which may include javax.activation.DataHandler
- // from the classpath passed to Axis emitter
-
- private boolean excludeJar(String buildPathString) {
-
- for (int i=0; i<JARLIST.length; i++) {
- if (buildPathString.toLowerCase().endsWith(JARLIST[i])) {
- return true;
- }
- }
- return false;
- }
-
private String[] classpathEntry2String(
IClasspathEntry entry,
IProject project)