Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba; +package org.apache.cxf.binding.corba; import java.net.URL; import javax.xml.namespace.QName; @@ -40,7 +40,7 @@ BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class); try { factory = (CorbaBindingFactory)bfm.getBindingFactory( - "http://schemas.apache.org/yoko/bindings/corba";); + "http://cxf.apache.org/bindings/corba";); bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory); } catch (BusException ex) { ex.printStackTrace(); @@ -67,7 +67,7 @@ } public CorbaDestination getComplexTypesTestDestination() throws Exception { - endpointInfo = setupServiceInfo("http://yoko.apache.org/ComplexTypes";, + endpointInfo = setupServiceInfo("http://cxf.apache.org/bindings/corba/ComplexTypes";, "/wsdl_corbabinding/ComplexTypes.wsdl", "ComplexTypesCORBAService", "ComplexTypesCORBAPort");
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.runtime; +package org.apache.cxf.binding.corba.runtime; import java.util.HashMap; import java.util.Map; @@ -53,7 +53,7 @@ java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.runtime; +package org.apache.cxf.binding.corba.runtime; import java.io.IOException; import java.math.BigInteger; @@ -25,6 +25,15 @@ import javax.xml.namespace.QName; +import org.apache.cxf.binding.corba.types.CorbaArrayHandler; +import org.apache.cxf.binding.corba.types.CorbaEnumHandler; +import org.apache.cxf.binding.corba.types.CorbaExceptionHandler; +import org.apache.cxf.binding.corba.types.CorbaFixedHandler; +import org.apache.cxf.binding.corba.types.CorbaObjectHandler; +import org.apache.cxf.binding.corba.types.CorbaObjectReferenceHandler; +import org.apache.cxf.binding.corba.types.CorbaPrimitiveHandler; +import org.apache.cxf.binding.corba.types.CorbaSequenceHandler; +import org.apache.cxf.binding.corba.types.CorbaStructHandler; import org.apache.cxf.binding.corba.wsdl.Array; import org.apache.cxf.binding.corba.wsdl.CorbaConstants; import org.apache.cxf.binding.corba.wsdl.Enum; @@ -35,22 +44,10 @@ import org.apache.cxf.binding.corba.wsdl.Sequence; import org.apache.cxf.binding.corba.wsdl.Struct; import org.apache.cxf.helpers.IOUtils; -import org.apache.yoko.binding.corba.types.CorbaArrayHandler; -import org.apache.yoko.binding.corba.types.CorbaEnumHandler; -import org.apache.yoko.binding.corba.types.CorbaExceptionHandler; -import org.apache.yoko.binding.corba.types.CorbaFixedHandler; -import org.apache.yoko.binding.corba.types.CorbaObjectHandler; -import org.apache.yoko.binding.corba.types.CorbaObjectReferenceHandler; -import org.apache.yoko.binding.corba.types.CorbaPrimitiveHandler; -import org.apache.yoko.binding.corba.types.CorbaSequenceHandler; -import org.apache.yoko.binding.corba.types.CorbaStructHandler; - - import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; - import org.omg.CORBA.ORB; import org.omg.CORBA.StructMember; import org.omg.CORBA.TCKind; @@ -67,7 +64,7 @@ java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Binding"); orb = ORB.init(new String[0], props); } @@ -373,7 +370,7 @@ structMembers[0] = new StructMember("member1", orb.get_primitive_tc(TCKind.tk_long), null); structMembers[1] = new StructMember("member2", orb.get_primitive_tc(TCKind.tk_string), null); structMembers[2] = new StructMember("member3", orb.get_primitive_tc(TCKind.tk_boolean), null); - TypeCode structTC = orb.create_struct_tc("IDL:org.apache.yoko.TestStruct/1.0", "TestStruct", + TypeCode structTC = orb.create_struct_tc("IDL:org.apache.cxf.TestStruct/1.0", "TestStruct", structMembers); CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType, structTC, structType); @@ -407,7 +404,7 @@ short code = 12345; String message = "54321"; - oStream.write_string("IDL:org.apache.yoko.TestException/1.0"); + oStream.write_string("IDL:org.apache.cxf.TestException/1.0"); oStream.write_short(code); oStream.write_string(message); @@ -436,7 +433,7 @@ StructMember[] exceptMembers = new StructMember[2]; exceptMembers[0] = new StructMember("code", orb.get_primitive_tc(TCKind.tk_short), null); exceptMembers[1] = new StructMember("message", orb.get_primitive_tc(TCKind.tk_string), null); - TypeCode exceptTC = orb.create_exception_tc("IDL:org.apache.yoko.TestException/1.0", "TestException", + TypeCode exceptTC = orb.create_exception_tc("IDL:org.apache.cxf.TestException/1.0", "TestException", exceptMembers); CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType, exceptTC, exceptType); @@ -521,8 +518,7 @@ assertNotNull(objRef); oStream.write_Object(objRef); - // we need an ORBinstance to handle reading objects so use the Yoko input stream and - // ORB_impl + // we need an ORBinstance to handle reading objects so use the input stream InputStream iStream = oStream.create_input_stream(); CorbaObjectReader reader = new CorbaObjectReader(iStream); Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.runtime; +package org.apache.cxf.binding.corba.runtime; import java.io.IOException; import java.math.BigInteger; @@ -24,6 +24,12 @@ import javax.xml.namespace.QName; +import org.apache.cxf.binding.corba.types.CorbaArrayHandler; +import org.apache.cxf.binding.corba.types.CorbaExceptionHandler; +import org.apache.cxf.binding.corba.types.CorbaObjectReferenceHandler; +import org.apache.cxf.binding.corba.types.CorbaPrimitiveHandler; +import org.apache.cxf.binding.corba.types.CorbaSequenceHandler; +import org.apache.cxf.binding.corba.types.CorbaStructHandler; import org.apache.cxf.binding.corba.wsdl.Array; import org.apache.cxf.binding.corba.wsdl.CorbaConstants; import org.apache.cxf.binding.corba.wsdl.Exception; @@ -31,14 +37,6 @@ import org.apache.cxf.binding.corba.wsdl.Sequence; import org.apache.cxf.binding.corba.wsdl.Struct; import org.apache.cxf.helpers.IOUtils; -import org.apache.yoko.binding.corba.types.CorbaArrayHandler; - -import org.apache.yoko.binding.corba.types.CorbaExceptionHandler; -import org.apache.yoko.binding.corba.types.CorbaObjectReferenceHandler; -import org.apache.yoko.binding.corba.types.CorbaPrimitiveHandler; -import org.apache.yoko.binding.corba.types.CorbaSequenceHandler; -import org.apache.yoko.binding.corba.types.CorbaStructHandler; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -60,7 +58,7 @@ java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Binding"); orb = ORB.init(new String[0], props); } @@ -351,7 +349,7 @@ structMembers[0] = new StructMember("member1", orb.get_primitive_tc(TCKind.tk_long), null); structMembers[1] = new StructMember("member2", orb.get_primitive_tc(TCKind.tk_string), null); structMembers[2] = new StructMember("member3", orb.get_primitive_tc(TCKind.tk_boolean), null); - TypeCode structTC = orb.create_struct_tc("IDL:org.apache.yoko.TestStruct/1.0", "TestStruct", + TypeCode structTC = orb.create_struct_tc("IDL:org.apache.cxf.TestStruct/1.0", "TestStruct", structMembers); CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType, structTC, structType); @@ -392,7 +390,7 @@ // } short code = 12345; String message = "54321"; - String reposID = "IDL:org.apache.yoko.TestException/1.0"; + String reposID = "IDL:org.apache.cxf.TestException/1.0"; QName exceptIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "exception", CorbaConstants.NP_WSDL_CORBA); Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java Thu Feb 7 12:09:58 2008 @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.runtime; +package org.apache.cxf.binding.corba.runtime; import javax.xml.namespace.QName; -import org.apache.yoko.binding.corba.types.CorbaTypeEventProducer; +import org.apache.cxf.binding.corba.types.CorbaTypeEventProducer; import org.easymock.classextension.EasyMock; import org.junit.Assert; import org.junit.Before; Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.runtime; +package org.apache.cxf.binding.corba.runtime; import javax.xml.namespace.NamespaceContext; Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java Thu Feb 7 12:09:58 2008 @@ -16,21 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.runtime; +package org.apache.cxf.binding.corba.runtime; import javax.xml.namespace.QName; - +import org.apache.cxf.binding.corba.CorbaStreamable; +import org.apache.cxf.binding.corba.types.CorbaPrimitiveHandler; import org.apache.cxf.binding.corba.wsdl.CorbaConstants; -import org.apache.yoko.binding.corba.CorbaStreamable; -import org.apache.yoko.binding.corba.types.CorbaPrimitiveHandler; - import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; - - import org.omg.CORBA.ORB; import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; @@ -47,7 +43,7 @@ public void setUp() throws Exception { java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Binding"); orb = ORB.init(new String[0], props); } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java Thu Feb 7 12:09:58 2008 @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.yoko.binding.corba.types; +package org.apache.cxf.binding.corba.types; import javax.xml.namespace.QName; +import org.apache.cxf.binding.corba.CorbaTypeMap; import org.apache.cxf.binding.corba.wsdl.CorbaConstants; -import org.apache.yoko.binding.corba.CorbaTypeMap; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -42,7 +41,7 @@ public void setUp() throws Exception { java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.types; +package org.apache.cxf.binding.corba.types; import javax.xml.namespace.QName; @@ -43,7 +43,7 @@ public void setUp() throws Exception { java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); obj = null; objName = null; Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.types; +package org.apache.cxf.binding.corba.types; import javax.xml.namespace.QName; @@ -38,7 +38,7 @@ @Before public void setUp() throws Exception { java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.types; +package org.apache.cxf.binding.corba.types; import javax.xml.namespace.QName; @@ -38,7 +38,7 @@ @Before public void setUp() throws Exception { java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.types; +package org.apache.cxf.binding.corba.types; import java.util.List; @@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.binding.BindingFactory; import org.apache.cxf.binding.BindingFactoryManager; +import org.apache.cxf.binding.corba.CorbaDestination; +import org.apache.cxf.binding.corba.CorbaTypeMap; +import org.apache.cxf.binding.corba.TestUtils; +import org.apache.cxf.binding.corba.utils.CorbaUtils; import org.apache.cxf.binding.corba.wsdl.CorbaConstants; import org.apache.cxf.binding.corba.wsdl.TypeMappingType; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.service.model.ServiceInfo; -import org.apache.yoko.binding.corba.CorbaDestination; -import org.apache.yoko.binding.corba.CorbaTypeMap; -import org.apache.yoko.binding.corba.TestUtils; -import org.apache.yoko.binding.corba.utils.CorbaUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -49,7 +49,8 @@ CorbaTypeMap typeMap; ServiceInfo service; - private final String complexTypesNamespaceURI = "http://yoko.apache.org/ComplexTypes/idl_types";; + private final String complexTypesNamespaceURI + = "http://cxf.apache.org/bindings/corba/ComplexTypes/idl_types";; private final String complexTypesPrefix = "corbatm"; private ORB orb; private Bus bus; @@ -60,13 +61,13 @@ bus = BusFactory.getDefaultBus(); BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class); - factory = (BindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba";); + factory = (BindingFactory)bfm.getBindingFactory("http://cxf.apache.org/bindings/corba";); bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory); java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); TestUtils testUtils = new TestUtils(); @@ -101,7 +102,7 @@ } public Destination getDestination() throws Exception { - setupServiceInfo("http://yoko.apache.org/ComplexTypes";, + setupServiceInfo("http://cxf.apache.org/bindings/corba/ComplexTypes";, "/wsdl/ComplexTypes.wsdl", "ComplexTypesCORBAService", "ComplexTypesCORBAPort"); Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.types; +package org.apache.cxf.binding.corba.types; import javax.xml.namespace.QName; @@ -41,7 +41,7 @@ java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.types; +package org.apache.cxf.binding.corba.types; import javax.xml.namespace.QName; @@ -37,7 +37,7 @@ @Before public void setUp() throws Exception { java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); } @@ -84,14 +84,14 @@ null); assertNotNull(obj); - // Yoko maps the XML char type to a Byte so we need to provide the string data as a Byte value + //CXF corba maps the XML char type to a Byte so we need to provide the string data as a Byte value Byte byteValue = new Byte((byte)val.charValue()); obj.setValueFromData(byteValue.toString()); String result = obj.getDataFromValue(); Byte byteResult = new Byte(result); assertTrue(byteResult.byteValue() == byteValue.byteValue()); - // However, internally, Yoko holds the data as a character to make it easier to marshal the data + // However, internally, we also hold the data as a character to make it easier to marshal the data // for CORBA. obj.setValue(val); Object resultObj = obj.getValue(); Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.types; +package org.apache.cxf.binding.corba.types; import javax.xml.namespace.QName; @@ -47,7 +47,7 @@ java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); obj = null; objName = null; Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java Thu Feb 7 12:09:58 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.types; +package org.apache.cxf.binding.corba.types; import javax.xml.namespace.QName; @@ -45,7 +45,7 @@ @Before public void setUp() throws Exception { java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java Thu Feb 7 12:09:58 2008 @@ -18,7 +18,7 @@ */ -package org.apache.yoko.binding.corba.utils; +package org.apache.cxf.binding.corba.utils; import org.apache.cxf.message.Exchange; import org.apache.cxf.message.ExchangeImpl; Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java?rev=619619&r1=619615&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java Thu Feb 7 12:09:58 2008 @@ -16,22 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.binding.corba.utils; +package org.apache.cxf.binding.corba.utils; import java.util.Stack; import javax.xml.namespace.QName; +import org.apache.cxf.binding.corba.CorbaBindingException; +import org.apache.cxf.binding.corba.CorbaTypeMap; import org.apache.cxf.binding.corba.wsdl.CorbaConstants; import org.apache.cxf.binding.corba.wsdl.CorbaType; -import org.apache.yoko.binding.corba.CorbaBindingException; -import org.apache.yoko.binding.corba.CorbaTypeMap; - import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; - import org.omg.CORBA.ORB; import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; @@ -43,7 +41,7 @@ @Before public void setUp() throws Exception { java.util.Properties props = System.getProperties(); - props.put("yoko.orb.id", "Yoko-Server-Binding"); + props.put("yoko.orb.id", "CXF-CORBA-Server-Binding"); orb = ORB.init(new String[0], props); } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/ComplexTypes.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/ComplexTypes.wsdl?rev=619619&r1=619618&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/ComplexTypes.wsdl (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/ComplexTypes.wsdl Thu Feb 7 12:09:58 2008 @@ -20,15 +20,15 @@ <!-- To be replace by a Yoko generated IDLtoWSDL once types supported --> <definitions - targetNamespace="http://yoko.apache.org/ComplexTypes"; + targetNamespace="http://cxf.apache.org/bindings/corba/ComplexTypes"; xmlns="http://schemas.xmlsoap.org/wsdl/"; - xmlns:tns="http://yoko.apache.org/ComplexTypes"; + xmlns:tns="http://cxf.apache.org/bindings/corba/ComplexTypes"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; - xmlns:xsd1="http://yoko.apache.org/ComplexTypes/types"; - xmlns:corba="http://schemas.apache.org/yoko/bindings/corba"; - xmlns:corbatm="http://yoko.apache.org/ComplexTypes/idl_types";> + xmlns:xsd1="http://cxf.apache.org/bindings/corba/ComplexTypes/types"; + xmlns:corba="http://cxf.apache.org/bindings/corba"; + xmlns:corbatm="http://cxf.apache.org/bindings/corba/ComplexTypes/idl_types";> <types> - <schema targetNamespace="http://yoko.apache.org/ComplexTypes/types"; + <schema targetNamespace="http://cxf.apache.org/bindings/corba/ComplexTypes/types"; xmlns="http://www.w3.org/2001/XMLSchema"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";> <xsd:complexType name="TestArray"> @@ -116,7 +116,7 @@ <corba:address location="corbaloc::localhost:50000/ComplexTypes"/> </port> </service> - <corba:typeMapping targetNamespace="http://yoko.apache.org/ComplexTypes/idl_types";> + <corba:typeMapping targetNamespace="http://cxf.apache.org/bindings/corba/ComplexTypes/idl_types";> <corba:array name="TestArray" repositoryID="IDL:TestArray:1.0" type="xsd1:TestArray" elemtype="corba:long" bound="5"/> <corba:sequence name="TestSequence" repositoryID="IDL:TestSequence:1.0" type="xsd1:TestSequence" elemtype="corba:short" bound="0"/> <corba:sequence name="TestBoundedSequence" repositoryID="IDL:TestBoundedSequence:1.0" type="xsd1:TestBoundedSequence" elemtype="corba:short" bound="5"/> Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/exceptions.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/exceptions.wsdl?rev=619619&r1=619618&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/exceptions.wsdl (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/exceptions.wsdl Thu Feb 7 12:09:58 2008 @@ -20,7 +20,7 @@ <!-- Generated by <idltowsdl> Tool. Version 4.0.0 --> <definitions name="except" targetNamespace="http://schemas.apache.org/idl/except"; xmlns="http://schemas.xmlsoap.org/wsdl/"; - xmlns:corba="http://schemas.apache.org/yoko/bindings/corba"; + xmlns:corba="http://cxf.apache.org/bindings/corba"; xmlns:corbatm="http://schemas.apache.org/typemap/corba/except"; xmlns:tns="http://schemas.apache.org/idl/except"; xmlns:wsa="http://www.w3.org/2005/08/addressing"; Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/simpleIdl.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/simpleIdl.wsdl?rev=619619&r1=619618&r2=619619&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/simpleIdl.wsdl (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/resources/wsdl_corbabinding/simpleIdl.wsdl Thu Feb 7 12:09:58 2008 @@ -20,16 +20,16 @@ <!-- Generated by <idltowsdl> Tool. Version 3.0.2 --> <definitions - targetNamespace="http://yoko.apache.org/simple"; + targetNamespace="http://cxf.apache.org/bindings/corba/simple"; xmlns="http://schemas.xmlsoap.org/wsdl/"; - xmlns:tns="http://yoko.apache.org/simple"; + xmlns:tns="http://cxf.apache.org/bindings/corba/simple"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; - xmlns:xsd1="http://yoko.apache.org/simple/types"; - xmlns:corba="http://schemas.apache.org/yoko/bindings/corba"; - xmlns:corbatm="http://yoko.apache.org/simple/idl_types"; + xmlns:xsd1="http://cxf.apache.org/bindings/corba/simple/types"; + xmlns:corba="http://cxf.apache.org/bindings/corba"; + xmlns:corbatm="http://cxf.apache.org/bindings/corba/simple/idl_types"; xmlns:references="http://schemas.iona.com/references";> <types> - <schema targetNamespace="http://yoko.apache.org/simple/types"; + <schema targetNamespace="http://cxf.apache.org/bindings/corba/simple/types"; xmlns="http://www.w3.org/2001/XMLSchema"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";> <xsd:element name="testSimpleMethod">
