Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools; +package org.apache.cxf.tools.corba; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -37,10 +37,10 @@ import javax.xml.stream.XMLStreamReader; import org.apache.cxf.helpers.FileUtils; -import org.apache.yoko.tools.common.ToolCorbaConstants; -import org.apache.yoko.tools.common.ToolTestBase; -import org.apache.yoko.tools.utils.TestUtils; -import org.apache.yoko.tools.utils.WSDLGenerationTester; +import org.apache.cxf.tools.corba.common.ToolCorbaConstants; +import org.apache.cxf.tools.corba.common.ToolTestBase; +import org.apache.cxf.tools.corba.utils.TestUtils; +import org.apache.cxf.tools.corba.utils.WSDLGenerationTester; public class IDLToWSDLTest extends ToolTestBase {
Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools; +package org.apache.cxf.tools.corba; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -35,9 +35,9 @@ import javax.xml.namespace.QName; import org.apache.cxf.helpers.FileUtils; -import org.apache.yoko.tools.common.ToolTestBase; -import org.apache.yoko.tools.processors.wsdl.WSDLToProcessor; -import org.apache.yoko.tools.utils.TestUtils; +import org.apache.cxf.tools.corba.common.ToolTestBase; +import org.apache.cxf.tools.corba.processors.wsdl.WSDLToProcessor; +import org.apache.cxf.tools.corba.utils.TestUtils; public class WSDLToIDLTest extends ToolTestBase { Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools.common; +package org.apache.cxf.tools.corba.common; import java.util.*; @@ -25,7 +25,7 @@ import junit.framework.TestCase; -import org.apache.yoko.wsdl.CorbaTypeImpl; +import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl; public class CorbaPrimitiveMapTest extends TestCase { Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/ToolTestBase.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools.common; +package org.apache.cxf.tools.corba.common; import java.io.ByteArrayOutputStream; import java.io.PrintStream; Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java Thu Feb 7 12:54:29 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.tools.idlpreprocessor; +package org.apache.cxf.tools.corba.idlpreprocessor; import java.io.File; import java.io.IOException; Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools.processors; +package org.apache.cxf.tools.corba.processors; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -35,10 +35,10 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; -import org.apache.yoko.tools.common.ProcessorEnvironment; -import org.apache.yoko.tools.common.ToolCorbaConstants; -import org.apache.yoko.tools.processors.idl.IDLToWSDLProcessor; -import org.apache.yoko.tools.utils.WSDLGenerationTester; +import org.apache.cxf.tools.corba.common.ProcessorEnvironment; +import org.apache.cxf.tools.corba.common.ToolCorbaConstants; +import org.apache.cxf.tools.corba.processors.idl.IDLToWSDLProcessor; +import org.apache.cxf.tools.corba.utils.WSDLGenerationTester; import org.junit.After; import org.junit.Assert; import org.junit.Before; Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools.processors; +package org.apache.cxf.tools.corba.processors; import java.io.File; import java.util.Iterator; @@ -37,16 +37,16 @@ import junit.framework.TestCase; -import org.apache.schemas.yoko.bindings.corba.BindingType; -import org.apache.schemas.yoko.bindings.corba.Fixed; -import org.apache.schemas.yoko.bindings.corba.OperationType; -import org.apache.schemas.yoko.bindings.corba.ParamType; -import org.apache.schemas.yoko.bindings.corba.Sequence; -import org.apache.schemas.yoko.bindings.corba.TypeMappingType; -import org.apache.yoko.tools.common.WSDLCorbaFactory; -import org.apache.yoko.tools.processors.wsdl.WSDLToCorbaBinding; -import org.apache.yoko.tools.processors.wsdl.WSDLToIDLAction; -import org.apache.yoko.wsdl.CorbaConstants; +import org.apache.cxf.binding.corba.wsdl.BindingType; +import org.apache.cxf.binding.corba.wsdl.CorbaConstants; +import org.apache.cxf.binding.corba.wsdl.Fixed; +import org.apache.cxf.binding.corba.wsdl.OperationType; +import org.apache.cxf.binding.corba.wsdl.ParamType; +import org.apache.cxf.binding.corba.wsdl.Sequence; +import org.apache.cxf.binding.corba.wsdl.TypeMappingType; +import org.apache.cxf.tools.corba.common.WSDLCorbaFactory; +import org.apache.cxf.tools.corba.processors.wsdl.WSDLToCorbaBinding; +import org.apache.cxf.tools.corba.processors.wsdl.WSDLToIDLAction; public class WSDLToCorbaBindingTest extends TestCase { WSDLToCorbaBinding generator; @@ -61,7 +61,7 @@ generator = new WSDLToCorbaBinding(); try { WSDLCorbaFactory wsdlfactory = WSDLCorbaFactory - .newInstance("org.apache.yoko.tools.common.WSDLCorbaFactoryImpl"); + .newInstance("org.apache.cxf.tools.corba.common.WSDLCorbaFactoryImpl"); writer = wsdlfactory.newWSDLWriter(); } catch (Exception ex) { Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools.processors; +package org.apache.cxf.tools.corba.processors; import java.io.File; import java.net.URL; @@ -36,20 +36,20 @@ import junit.framework.TestCase; -import org.apache.schemas.yoko.bindings.corba.AddressType; -import org.apache.schemas.yoko.bindings.corba.Anonarray; -import org.apache.schemas.yoko.bindings.corba.Anonfixed; -import org.apache.schemas.yoko.bindings.corba.Anonsequence; -import org.apache.schemas.yoko.bindings.corba.Anonstring; -import org.apache.schemas.yoko.bindings.corba.Array; -import org.apache.schemas.yoko.bindings.corba.Struct; -import org.apache.schemas.yoko.bindings.corba.TypeMappingType; -import org.apache.schemas.yoko.bindings.corba.Union; -import org.apache.schemas.yoko.bindings.corba.Unionbranch; -import org.apache.yoko.tools.common.WSDLCorbaFactory; -import org.apache.yoko.tools.processors.wsdl.WSDLToCorbaBinding; -import org.apache.yoko.tools.processors.wsdl.WSDLToIDLAction; -import org.apache.yoko.wsdl.CorbaTypeImpl; +import org.apache.cxf.binding.corba.wsdl.AddressType; +import org.apache.cxf.binding.corba.wsdl.Anonarray; +import org.apache.cxf.binding.corba.wsdl.Anonfixed; +import org.apache.cxf.binding.corba.wsdl.Anonsequence; +import org.apache.cxf.binding.corba.wsdl.Anonstring; +import org.apache.cxf.binding.corba.wsdl.Array; +import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl; +import org.apache.cxf.binding.corba.wsdl.Struct; +import org.apache.cxf.binding.corba.wsdl.TypeMappingType; +import org.apache.cxf.binding.corba.wsdl.Union; +import org.apache.cxf.binding.corba.wsdl.Unionbranch; +import org.apache.cxf.tools.corba.common.WSDLCorbaFactory; +import org.apache.cxf.tools.corba.processors.wsdl.WSDLToCorbaBinding; +import org.apache.cxf.tools.corba.processors.wsdl.WSDLToIDLAction; public class WSDLToCorbaBindingTypeTest extends TestCase { WSDLToCorbaBinding generator; @@ -63,7 +63,7 @@ generator = new WSDLToCorbaBinding(); try { WSDLCorbaFactory wsdlfactory = WSDLCorbaFactory - .newInstance("org.apache.yoko.tools.common.WSDLCorbaFactoryImpl"); + .newInstance("org.apache.cxf.tools.corba.common.WSDLCorbaFactoryImpl"); writer = wsdlfactory.newWSDLWriter(); } catch (Exception ex) { Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools.processors; +package org.apache.cxf.tools.corba.processors; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -30,7 +30,7 @@ import junit.framework.TestCase; -import org.apache.yoko.tools.processors.wsdl.WSDLToIDLAction; +import org.apache.cxf.tools.corba.processors.wsdl.WSDLToIDLAction; public class WSDLToIDLGenerationTest extends TestCase { Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestUtils.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestUtils.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestUtils.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestUtils.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools.utils; +package org.apache.cxf.tools.corba.utils; import java.io.InputStream; Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaFactoryImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaFactoryImpl.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaFactoryImpl.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaFactoryImpl.java Thu Feb 7 12:54:29 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.tools.utils; +package org.apache.cxf.tools.corba.utils; import javax.wsdl.xml.WSDLWriter; Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java Thu Feb 7 12:54:29 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.yoko.tools.utils; +package org.apache.cxf.tools.corba.utils; import java.util.Map; import java.util.TreeMap; Modified: incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java?rev=619634&r1=619420&r2=619634&view=diff ============================================================================== --- incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java (original) +++ incubator/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java Thu Feb 7 12:54:29 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.yoko.tools.utils; +package org.apache.cxf.tools.corba.utils; import java.io.File; import java.io.FileReader; @@ -27,23 +27,21 @@ import javax.wsdl.BindingOperation; import javax.wsdl.Definition; import javax.wsdl.Port; - import javax.wsdl.extensions.ExtensionRegistry; import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; import javax.wsdl.xml.WSDLWriter; - import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamReader; import junit.framework.Assert; +import org.apache.cxf.binding.corba.wsdl.BindingType; +import org.apache.cxf.binding.corba.wsdl.CorbaConstants; +import org.apache.cxf.binding.corba.wsdl.TypeMappingType; import org.apache.cxf.wsdl.JAXBExtensionHelper; -import org.apache.schemas.yoko.bindings.corba.BindingType; -import org.apache.schemas.yoko.bindings.corba.TypeMappingType; import org.apache.ws.commons.schema.XmlSchema; import org.apache.ws.commons.schema.XmlSchemaCollection; -import org.apache.yoko.wsdl.CorbaConstants; public class WSDLGenerationTester { @@ -136,7 +134,8 @@ public File writeDefinition(File targetDir, File defnFile) throws Exception { File bkFile = new File(targetDir, "bk_" + defnFile.getName()); FileWriter writer = new FileWriter(bkFile); - WSDLFactory factory = WSDLFactory.newInstance("org.apache.yoko.tools.utils.TestWSDLCorbaFactoryImpl"); + WSDLFactory factory + = WSDLFactory.newInstance("org.apache.cxf.tools.corba.utils.TestWSDLCorbaFactoryImpl"); WSDLReader reader = factory.newWSDLReader(); reader.setFeature("javax.wsdl.importDocuments", false); ExtensionRegistry extReg = new ExtensionRegistry(); @@ -167,18 +166,18 @@ private void addExtensions(ExtensionRegistry extReg) throws Exception { JAXBExtensionHelper.addExtensions(extReg, Binding.class, BindingType.class); JAXBExtensionHelper.addExtensions(extReg, BindingOperation.class, - org.apache.schemas.yoko.bindings.corba.OperationType.class); + org.apache.cxf.binding.corba.wsdl.OperationType.class); JAXBExtensionHelper.addExtensions(extReg, Definition.class, TypeMappingType.class); JAXBExtensionHelper.addExtensions(extReg, Port.class, - org.apache.schemas.yoko.bindings.corba.AddressType.class); + org.apache.cxf.binding.corba.wsdl.AddressType.class); extReg.mapExtensionTypes(Binding.class, CorbaConstants.NE_CORBA_BINDING, BindingType.class); extReg.mapExtensionTypes(BindingOperation.class, CorbaConstants.NE_CORBA_OPERATION, - org.apache.schemas.yoko.bindings.corba.OperationType.class); + org.apache.cxf.binding.corba.wsdl.OperationType.class); extReg.mapExtensionTypes(Definition.class, CorbaConstants.NE_CORBA_TYPEMAPPING, TypeMappingType.class); extReg.mapExtensionTypes(Port.class, CorbaConstants.NE_CORBA_ADDRESS, - org.apache.schemas.yoko.bindings.corba.AddressType.class); + org.apache.cxf.binding.corba.wsdl.AddressType.class); } }
