You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/06/26 21:32:59 UTC
svn commit: r788828 - in /cxf/branches/2.2.x-fixes: ./ rt/bindings/corba/
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/
Author: dkulp
Date: Fri Jun 26 19:32:59 2009
New Revision: 788828
URL: http://svn.apache.org/viewvc?rev=788828&view=rev
Log:
Merged revisions 788774 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r788774 | dkulp | 2009-06-26 13:25:41 -0400 (Fri, 26 Jun 2009) | 2 lines
Remove commons-codec from required jars list for corba bindings (still
needed by abdera/jax-rs though)
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/bindings/corba/pom.xml
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 26 19:32:59 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788451,788703
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788451,788703,788774
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/bindings/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/corba/pom.xml?rev=788828&r1=788827&r2=788828&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/corba/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/corba/pom.xml Fri Jun 26 19:32:59 2009
@@ -65,11 +65,6 @@
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
</dependencies>
Modified: cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java?rev=788828&r1=788827&r2=788828&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java (original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java Fri Jun 26 19:32:59 2009
@@ -18,10 +18,9 @@
*/
package org.apache.cxf.binding.corba.types;
+import javax.xml.bind.DatatypeConverter;
import javax.xml.namespace.QName;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.binary.Hex;
import org.apache.cxf.binding.corba.CorbaBindingException;
import org.apache.cxf.binding.corba.wsdl.W3CConstants;
import org.omg.CORBA.TypeCode;
@@ -50,9 +49,9 @@
public String getDataFromValue() {
String result;
if (isBase64Octets) {
- result = new String(Base64.encodeBase64(value));
+ result = new String(DatatypeConverter.printBase64Binary(value));
} else {
- result = new String(Hex.encodeHex(value));
+ result = new String(DatatypeConverter.printHexBinary(value));
}
return result;
}
@@ -60,9 +59,9 @@
public void setValueFromData(String data) {
try {
if (isBase64Octets) {
- value = Base64.decodeBase64(data.getBytes());
+ value = DatatypeConverter.parseBase64Binary(data);
} else {
- value = Hex.decodeHex(data.toCharArray());
+ value = DatatypeConverter.parseHexBinary(data);
}
} catch (Exception ex) {
throw new CorbaBindingException("Not able to parse the octet sequence", ex);
Modified: cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java?rev=788828&r1=788827&r2=788828&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java (original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java Fri Jun 26 19:32:59 2009
@@ -29,11 +29,10 @@
import javax.wsdl.Definition;
import javax.wsdl.Port;
import javax.wsdl.Service;
+import javax.xml.bind.DatatypeConverter;
import javax.xml.namespace.QName;
import com.ibm.wsdl.ImportImpl;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
import org.apache.cxf.binding.corba.wsdl.BindingType;
import org.apache.cxf.common.logging.LogUtils;
import org.omg.CORBA.Object;
@@ -157,13 +156,7 @@
public static String extractTypeIdFromIOR(String url) {
String ret = new String();
- byte data[] = null;
- try {
- // skip past IOR:
- data = Hex.decodeHex(url.substring(4).toCharArray());
- } catch (DecoderException e) {
- throw new RuntimeException("Failed to convert ascii hex ior to byte[], ior url=" + url, e);
- }
+ byte data[] = DatatypeConverter.parseHexBinary(url.substring(4));
if (data.length > 0) {
// parse out type_id from IOR CDR encapsulation
boolean bigIndian = !(data[0] > 0);