You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/12/26 13:13:08 UTC
svn commit: r606893 - in /webservices/axis2/trunk/java: ./
modules/adb/src/org/apache/axis2/databinding/utils/
modules/integration/test/org/tempuri/differenceEngine/
modules/kernel/src/org/apache/axis2/context/externalize/
modules/kernel/src/org/apache...
Author: dims
Date: Wed Dec 26 04:13:06 2007
New Revision: 606893
URL: http://svn.apache.org/viewvc?rev=606893&view=rev
Log:
Fix build break under JDK1.4
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java
webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java
webservices/axis2/trunk/java/pom.xml
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=606893&r1=606892&r2=606893&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Wed Dec 26 04:13:06 2007
@@ -1087,7 +1087,7 @@
for (int i = 0; i < listSize; i++) {
Object o = objectList.get(i);
if (o != null) {
- array[i] = Boolean.parseBoolean(o.toString());
+ array[i] = o.toString().equalsIgnoreCase("true");
}
}
returnArray = array;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java?rev=606893&r1=606892&r2=606893&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java Wed Dec 26 04:13:06 2007
@@ -24,6 +24,8 @@
import org.custommonkey.xmlunit.DifferenceListener;
import org.w3c.dom.Attr;
+import java.lang.reflect.Method;
+
/**
* This class extends the DifferenceEngine class to overwrite the methods that
* incorrectly fail Diff.similar() for certain equivalent but not identical
@@ -100,7 +102,12 @@
if (value == null || index == -1 || index == protocol)
return null;
-
- return attr.lookupNamespaceURI(value.substring(0, index));
+
+ try {
+ Method m = Attr.class.getMethod("lookupNamespaceURI", new Class[]{String.class});
+ return (String) m.invoke(attr, new Object[]{value.substring(0, index)});
+ } catch (Exception e) {
+ return null;
+ }
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java?rev=606893&r1=606892&r2=606893&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java Wed Dec 26 04:13:06 2007
@@ -18,8 +18,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.Closeable;
-import java.io.Flushable;
import java.io.IOException;
import java.io.ObjectOutput;
import java.io.ObjectStreamConstants;
@@ -28,8 +26,8 @@
* DebugObjectOutputStream delegates to an ObjectOutput object.
* Each method logs in/out trace information
*/
-public class DebugObjectOutputStream implements ObjectStreamConstants, ObjectOutput, Closeable,
- Flushable {
+public class DebugObjectOutputStream implements ObjectStreamConstants, ObjectOutput
+ {
private static final Log log = LogFactory.getLog(DebugObjectOutputStream.class);
private static final boolean isDebug = log.isDebugEnabled();
ObjectOutput out;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java?rev=606893&r1=606892&r2=606893&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java Wed Dec 26 04:13:06 2007
@@ -19,8 +19,6 @@
import org.apache.commons.logging.LogFactory;
import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.Flushable;
import java.io.IOException;
import java.io.NotSerializableException;
import java.io.ObjectOutput;
@@ -50,7 +48,7 @@
* @see SafeObjectInputStream
*
*/
-public class SafeObjectOutputStream implements Closeable, Flushable, ObjectOutput,
+public class SafeObjectOutputStream implements ObjectOutput,
ObjectStreamConstants, ExternalizeConstants {
private static final Log log = LogFactory.getLog(SafeObjectOutputStream.class);
@@ -682,7 +680,7 @@
return;
}
if (obj != null) {
- String name = obj.getClass().getCanonicalName();
+ String name = obj.getClass().getName();
Object value = notSerializableList.get(name);
if (value == null) {
notSerializableList.put(name, name);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java?rev=606893&r1=606892&r2=606893&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java Wed Dec 26 04:13:06 2007
@@ -1071,7 +1071,7 @@
URI uri = null;
if (url != null) {
- uri = url.toURI();
+ uri = new URI(url.toString());
}
// Check if the uri has relative path
Modified: webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java?rev=606893&r1=606892&r2=606893&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java (original)
+++ webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java Wed Dec 26 04:13:06 2007
@@ -181,7 +181,7 @@
serializeDomElement((Element) node, writer, namespacePrefix);
} else if (node instanceof Text) {
textNode = (Text) node;
- writer.writeCharacters(textNode.getWholeText());
+ writer.writeCharacters(textNode.getNodeValue());
} else {
throw new XmlSerializingException("Unknown dom element node found node type ==>"
+ node.getNodeType());
Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?rev=606893&r1=606892&r2=606893&view=diff
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Wed Dec 26 04:13:06 2007
@@ -61,7 +61,6 @@
<module>modules/samples</module>
<module>modules/scripting</module>
<module>modules/rmi</module>
- <module>modules/corba</module>
</modules>
<profiles>
<profile>
@@ -126,6 +125,7 @@
<module>modules/jaxws-api</module>
<module>modules/jaxws</module>
<module>modules/clustering</module>
+ <module>modules/corba</module>
</modules>
<build>
<plugins>
@@ -174,6 +174,7 @@
<module>modules/jaxws-api</module>
<module>modules/jaxws</module>
<module>modules/clustering</module>
+ <module>modules/corba</module>
</modules>
<build>
<plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r606893 - in /webservices/axis2/trunk/java: ./
modules/adb/src/org/apache/axis2/databinding/utils/
modules/integration/test/org/tempuri/differenceEngine/
modules/kernel/src/org/apache/axis2/context/externalize/
modules/kernel/src/org/apache...
Posted by Glen Daniels <gl...@thoughtcraft.com>.
WB dims!!! :) :) (and thanks for the fix)
--G
dims@apache.org wrote:
> Author: dims
> Date: Wed Dec 26 04:13:06 2007
> New Revision: 606893
>
> URL: http://svn.apache.org/viewvc?rev=606893&view=rev
> Log:
> Fix build break under JDK1.4
>
> Modified:
> webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
> webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java
> webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java
> webservices/axis2/trunk/java/pom.xml
>
> Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=606893&r1=606892&r2=606893&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
> +++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Wed Dec 26 04:13:06 2007
> @@ -1087,7 +1087,7 @@
> for (int i = 0; i < listSize; i++) {
> Object o = objectList.get(i);
> if (o != null) {
> - array[i] = Boolean.parseBoolean(o.toString());
> + array[i] = o.toString().equalsIgnoreCase("true");
> }
> }
> returnArray = array;
>
> Modified: webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java?rev=606893&r1=606892&r2=606893&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java (original)
> +++ webservices/axis2/trunk/java/modules/integration/test/org/tempuri/differenceEngine/WSDLDifferenceEngine.java Wed Dec 26 04:13:06 2007
> @@ -24,6 +24,8 @@
> import org.custommonkey.xmlunit.DifferenceListener;
> import org.w3c.dom.Attr;
>
> +import java.lang.reflect.Method;
> +
> /**
> * This class extends the DifferenceEngine class to overwrite the methods that
> * incorrectly fail Diff.similar() for certain equivalent but not identical
> @@ -100,7 +102,12 @@
>
> if (value == null || index == -1 || index == protocol)
> return null;
> -
> - return attr.lookupNamespaceURI(value.substring(0, index));
> +
> + try {
> + Method m = Attr.class.getMethod("lookupNamespaceURI", new Class[]{String.class});
> + return (String) m.invoke(attr, new Object[]{value.substring(0, index)});
> + } catch (Exception e) {
> + return null;
> + }
> }
> }
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java?rev=606893&r1=606892&r2=606893&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/DebugObjectOutputStream.java Wed Dec 26 04:13:06 2007
> @@ -18,8 +18,6 @@
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
>
> -import java.io.Closeable;
> -import java.io.Flushable;
> import java.io.IOException;
> import java.io.ObjectOutput;
> import java.io.ObjectStreamConstants;
> @@ -28,8 +26,8 @@
> * DebugObjectOutputStream delegates to an ObjectOutput object.
> * Each method logs in/out trace information
> */
> -public class DebugObjectOutputStream implements ObjectStreamConstants, ObjectOutput, Closeable,
> - Flushable {
> +public class DebugObjectOutputStream implements ObjectStreamConstants, ObjectOutput
> + {
> private static final Log log = LogFactory.getLog(DebugObjectOutputStream.class);
> private static final boolean isDebug = log.isDebugEnabled();
> ObjectOutput out;
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java?rev=606893&r1=606892&r2=606893&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java Wed Dec 26 04:13:06 2007
> @@ -19,8 +19,6 @@
> import org.apache.commons.logging.LogFactory;
>
> import java.io.ByteArrayOutputStream;
> -import java.io.Closeable;
> -import java.io.Flushable;
> import java.io.IOException;
> import java.io.NotSerializableException;
> import java.io.ObjectOutput;
> @@ -50,7 +48,7 @@
> * @see SafeObjectInputStream
> *
> */
> -public class SafeObjectOutputStream implements Closeable, Flushable, ObjectOutput,
> +public class SafeObjectOutputStream implements ObjectOutput,
> ObjectStreamConstants, ExternalizeConstants {
>
> private static final Log log = LogFactory.getLog(SafeObjectOutputStream.class);
> @@ -682,7 +680,7 @@
> return;
> }
> if (obj != null) {
> - String name = obj.getClass().getCanonicalName();
> + String name = obj.getClass().getName();
> Object value = notSerializableList.get(name);
> if (value == null) {
> notSerializableList.put(name, name);
>
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java?rev=606893&r1=606892&r2=606893&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java Wed Dec 26 04:13:06 2007
> @@ -1071,7 +1071,7 @@
>
> URI uri = null;
> if (url != null) {
> - uri = url.toURI();
> + uri = new URI(url.toString());
> }
>
> // Check if the uri has relative path
>
> Modified: webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java?rev=606893&r1=606892&r2=606893&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java (original)
> +++ webservices/axis2/trunk/java/modules/rmi/src/org/apache/axis2/rmi/custombeans/DomElementBean.java Wed Dec 26 04:13:06 2007
> @@ -181,7 +181,7 @@
> serializeDomElement((Element) node, writer, namespacePrefix);
> } else if (node instanceof Text) {
> textNode = (Text) node;
> - writer.writeCharacters(textNode.getWholeText());
> + writer.writeCharacters(textNode.getNodeValue());
> } else {
> throw new XmlSerializingException("Unknown dom element node found node type ==>"
> + node.getNodeType());
>
> Modified: webservices/axis2/trunk/java/pom.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?rev=606893&r1=606892&r2=606893&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/pom.xml (original)
> +++ webservices/axis2/trunk/java/pom.xml Wed Dec 26 04:13:06 2007
> @@ -61,7 +61,6 @@
> <module>modules/samples</module>
> <module>modules/scripting</module>
> <module>modules/rmi</module>
> - <module>modules/corba</module>
> </modules>
> <profiles>
> <profile>
> @@ -126,6 +125,7 @@
> <module>modules/jaxws-api</module>
> <module>modules/jaxws</module>
> <module>modules/clustering</module>
> + <module>modules/corba</module>
> </modules>
> <build>
> <plugins>
> @@ -174,6 +174,7 @@
> <module>modules/jaxws-api</module>
> <module>modules/jaxws</module>
> <module>modules/clustering</module>
> + <module>modules/corba</module>
> </modules>
> <build>
> <plugins>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org