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/30 16:09:32 UTC
svn commit: r789744 - in /cxf/branches/2.1.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: Tue Jun 30 14:09:32 2009
New Revision: 789744
URL: http://svn.apache.org/viewvc?rev=789744&view=rev
Log:
Merged revisions 788828 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r788828 | dkulp | 2009-06-26 15:32:59 -0400 (Fri, 26 Jun 2009) | 10 lines
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.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/bindings/corba/pom.xml
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 14:09:32 2009
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
67,788824-788825,788827
-/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703
+/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
67,788824-788825,788827-788828
+/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/bindings/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/pom.xml?rev=789744&r1=789743&r2=789744&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/pom.xml Tue Jun 30 14:09:32 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.1.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.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java?rev=789744&r1=789743&r2=789744&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java (original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java Tue Jun 30 14:09:32 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.1.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.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java?rev=789744&r1=789743&r2=789744&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java (original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java Tue Jun 30 14:09:32 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);