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 2008/01/04 16:47:53 UTC
svn commit: r608894 [1/10] - in /incubator/cxf/trunk: ./
buildtools/src/main/resources/
common/schemas/src/main/resources/schemas/wsdl/ etc/eclipse/
maven-plugins/corba/ parent/ rt/bindings/corba/
rt/bindings/corba/src/main/java/org/apache/yoko/binding...
Author: dkulp
Date: Fri Jan 4 07:47:28 2008
New Revision: 608894
URL: http://svn.apache.org/viewvc?rev=608894&view=rev
Log:
First set of fixes for migration of yoko to cxf (had to update yoko from cxf 2.0, they hadn't picked up any of the recent versions)
-Pfastinstall now is sucessful in corba tools and binding
checkstyle is OK in tools
Mostly, just committing this now as it's a LOT of changes that I don't want lost. Much work remains.
Added:
incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml
- copied, changed from r608604, incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml
incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle-corba
- copied, changed from r608604, incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle
incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/corba-binding.xsd
- copied unchanged from r608612, incubator/yoko/trunk/api/src/main/resources/schemas/wsdl/corba-binding.xsd
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaOctetSequenceHandler.java (with props)
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaOctetSequenceListener.java (with props)
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/wsdl/
- copied from r608628, incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/wsdl/CorbaConstants.java
- copied, changed from r608887, incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaConstants.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/wsdl/CorbaTypeImpl.java
- copied, changed from r608887, incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/CorbaTypeImpl.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/wsdl/W3CConstants.java
- copied, changed from r608887, incubator/yoko/trunk/api/src/main/java/org/apache/yoko/wsdl/W3CConstants.java
incubator/cxf/trunk/rt/bindings/corba/src/main/resources/catalog.cat (with props)
incubator/cxf/trunk/rt/bindings/corba/src/main/resources/schemas/
incubator/cxf/trunk/rt/bindings/corba/src/main/resources/schemas/wsdl/
incubator/cxf/trunk/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xjb (with props)
incubator/cxf/trunk/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd (with props)
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java (with props)
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamReaderTest.java (with props)
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamWriterTest.java (with props)
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/Processor.java (with props)
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/IDLModuleProcessor.java (with props)
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/IDLProcessor.java (with props)
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ModuleToNSMapper.java (with props)
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/SchemaDeferredAction.java (with props)
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/WSDLSchemaManager.java (with props)
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/utils/TestWSDLCorbaFactoryImpl.java (with props)
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/utils/TestWSDLCorbaWriterImpl.java (with props)
Removed:
incubator/cxf/trunk/maven-plugins/corba/.checkstyle
incubator/cxf/trunk/maven-plugins/corba/.pmd
incubator/cxf/trunk/maven-plugins/corba/.ruleset
incubator/cxf/trunk/maven-plugins/corba/LICENSE
incubator/cxf/trunk/maven-plugins/corba/NOTICE
incubator/cxf/trunk/maven-plugins/corba/checkstyle.xml
incubator/cxf/trunk/rt/bindings/corba/LICENSE
incubator/cxf/trunk/rt/bindings/corba/NOTICE
incubator/cxf/trunk/rt/bindings/corba/checkstyle.xml
incubator/cxf/trunk/tools/corba/.checkstyle
incubator/cxf/trunk/tools/corba/.pmd
incubator/cxf/trunk/tools/corba/.ruleset
incubator/cxf/trunk/tools/corba/LICENSE
incubator/cxf/trunk/tools/corba/NOTICE
incubator/cxf/trunk/tools/corba/checkstyle.xml
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/DeferredActionBase.java
Modified:
incubator/cxf/trunk/etc/eclipse/addcheckstyle.xsl
incubator/cxf/trunk/etc/eclipse/template.checkstyle-config.xml
incubator/cxf/trunk/parent/pom.xml
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/bindings/corba/ (props changed)
incubator/cxf/trunk/rt/bindings/corba/pom.xml
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingException.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaTypeMap.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/TypeMapCache.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamFaultInInterceptor.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamFaultOutInterceptor.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamInInterceptor.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServant.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaFaultStreamWriter.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReader.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriter.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamReader.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamWriter.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableImpl.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/AbstractCorbaTypeListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/AbstractNoStartEndEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/AbstractStartEndEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaAnonStructEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaAnyEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaAnyListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaArrayEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaArrayListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaEnumEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaEnumListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaExceptionEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaExceptionHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaExceptionListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaFixedEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaFixedListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtils.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaObjectReferenceEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaObjectReferenceHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaObjectReferenceListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaOctetSequenceEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveSequenceEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveTypeEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaSequenceEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaSequenceListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaStructEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaStructHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaStructListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaTypeEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaTypeListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaUnionEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaUnionHandler.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/CorbaUnionListener.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/HandlerIterator.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/ParameterEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/SkipStartEndEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/types/WrappedParameterSequenceEventProducer.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaUtils.java
incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/utils/EprMetaData.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/ObjectFactory.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/ParamModes.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/ParamModesCORBAService.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleInOutParams.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleInOutParamsResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleInOutParamsWithReturn.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleInOutParamsWithReturnResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleInParams.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleInParamsResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleInParamsWithReturn.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleInParamsWithReturnResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParams.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturn.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleMixedParamsWithReturnResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParams.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturn.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestMultipleOutParamsWithReturnResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturn.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestReturnResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParam.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturn.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInOutParamWithReturnResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParam.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturn.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleInParamWithReturnResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParam.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturn.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/TestSingleOutParamWithReturnResponse.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/schemas/yoko/idl/parammodes/package-info.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/AbstractIdlToWsdlTypeTestClient.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingFactoryTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaExceptionTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaNestedObjReferenceTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaOperationNameManglingTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTestImpl.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/ServerLauncher.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaDSIServantTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectReaderTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaObjectWriterTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/simple/Simple.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/simple/SimpleCORBAService.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/simple/types/ObjectFactory.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/simple/types/TestSimpleMethod.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/simple/types/TestSimpleMethodResult.java
incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/simple/types/package-info.java
incubator/cxf/trunk/tools/corba/pom.xml
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/IDLToWSDL.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/WSDLToIDL.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/CorbaPrimitiveMap.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/PrimitiveMapBase.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/ProcessorEnvironment.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/ReferenceConstants.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/SchemaFactory.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/SchemaFactoryImpl.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/SchemaWriterImpl.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/ToolCorbaConstants.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/WSDLCorbaFactory.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/WSDLCorbaFactoryImpl.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/WSDLCorbaWriterImpl.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/WSDLUtils.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/XmlSchemaPrimitiveMap.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/CorbaUtils.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlAnonArray.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlAnonFixed.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlAnonSequence.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlArray.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlArrayBase.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlAttribute.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlConst.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlDefn.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlDefnImplBase.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlEnum.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlEnumerator.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlException.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlField.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlFixed.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlFixedBase.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlInterface.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlModule.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlOperation.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlParam.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlPrimitive.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlRoot.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlScopeBase.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlScopedName.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlSequence.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlSequenceBase.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlString.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlStruct.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlStructBase.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlType.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlTypedef.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlUnion.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlUnionBranch.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/idltypes/IdlWString.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/toolspec/toolspecs/idl2wsdl.xml
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/common/toolspec/toolspecs/wsdl2idl.xml
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/idlpreprocessor/DefaultIncludeResolver.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/idlpreprocessor/IdlPreprocessorReader.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ArrayDeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/AttributeDeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/AttributeVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ConstVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ConstrTypeSpecVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/DeclaratorVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/DeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/DeferredActionCollection.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/DefinitionVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/EnumVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ExceptionDeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ExceptionVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/FixedPtConstVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ModuleVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ObjectReferenceVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/OperationDeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/OperationVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ParamDclVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ParamDeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ParamTypeSpecVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/PrimitiveTypesVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/Scope.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ScopeNameCollection.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/ScopedNameVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/SequenceDeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/SequenceVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/SimpleTypeSpecVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/StringVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/StructDeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/StructVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/TemplateTypeSpecVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/TypeDclVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/TypedefDeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/TypedefVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/TypesUtils.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitorBase.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/UnionDeferredAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/UnionVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/Visitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/VisitorBase.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/VisitorTypeHolder.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLParameter.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaHelper.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaProcessor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToTypeProcessor.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLTypes.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/utils/FileOutputStreamFactory.java
incubator/cxf/trunk/tools/corba/src/main/java/org/apache/yoko/tools/utils/OutputStreamFactory.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/IDLToWSDLTest.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/WSDLToIDLTest.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/common/CorbaPrimitiveMapTest.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/common/ToolTestBase.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/idlpreprocessor/IdlPreprocessorReaderTest.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/processors/IDLToWSDLGenerationTest.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTest.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/processors/WSDLToCorbaBindingTypeTest.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/processors/WSDLToIDLGenerationTest.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/utils/TestUtils.java
incubator/cxf/trunk/tools/corba/src/test/java/org/apache/yoko/tools/utils/WSDLGenerationTester.java
Copied: incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml (from r608604, incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml?p2=incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml&p1=incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml&r1=608604&r2=608894&rev=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml (original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml Fri Jan 4 07:47:28 2008
@@ -59,15 +59,21 @@
<!-- Checks for Naming Conventions. -->
<!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName" />
- <module name="LocalFinalVariableName" />
- <module name="LocalVariableName" />
- <module name="MemberName" />
- <module name="MethodName" />
- <module name="PackageName" />
- <module name="ParameterName" />
- <module name="StaticVariableName" />
- <module name="TypeName" />
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName">
+ <property name="format"
+ value="^[a-z_][a-zA-Z0-9_]*$"/>
+ </module>
+ <module name="MethodName">
+ <property name="format"
+ value="^[a-z_][a-zA-Z0-9_]*$"/>
+ </module>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
<!-- Header checks -->
<module name="Header">
Copied: incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle-corba (from r608604, incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle-corba?p2=incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle-corba&p1=incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle&r1=608604&r2=608894&rev=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle (original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle-corba Fri Jan 4 07:47:28 2008
@@ -18,7 +18,7 @@
under the License.
-->
<fileset-config file-format-version="1.1.0" simple-config="false">
- <fileset name="all" enabled="true" check-config-name="CXF Checks" type="external" description="">
+ <fileset name="all" enabled="true" check-config-name="CXF CORBA Checks" type="external" description="">
<file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/>
<file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]." include-pattern="false"/>
<file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]." include-pattern="false"/>
Modified: incubator/cxf/trunk/etc/eclipse/addcheckstyle.xsl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/etc/eclipse/addcheckstyle.xsl?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/etc/eclipse/addcheckstyle.xsl (original)
+++ incubator/cxf/trunk/etc/eclipse/addcheckstyle.xsl Fri Jan 4 07:47:28 2008
@@ -23,6 +23,7 @@
<xsl:strip-space elements="*"/>
<xsl:param name="checkstyleconfig"/>
+ <xsl:param name="checkstyleconfigcorba"/>
<xsl:template match="*">
<xsl:copy>
@@ -36,11 +37,13 @@
<xsl:copy-of select="@*"/>
<xsl:apply-templates/>
-
<xsl:choose>
- <xsl:when test="not(check-configuration/@name='CXF Checks')">
+ <xsl:when test="not(check-configuration/@name='CXF CORBA Checks')">
<check-configuration name="CXF Checks" type="external" description="">
<xsl:attribute name="location"><xsl:value-of select="$checkstyleconfig"/></xsl:attribute>
+ </check-configuration>
+ <check-configuration name="CXF CORBA Checks" type="external" description="">
+ <xsl:attribute name="location"><xsl:value-of select="$checkstyleconfigcorba"/></xsl:attribute>
</check-configuration>
</xsl:when>
</xsl:choose>
Modified: incubator/cxf/trunk/etc/eclipse/template.checkstyle-config.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/etc/eclipse/template.checkstyle-config.xml?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/etc/eclipse/template.checkstyle-config.xml (original)
+++ incubator/cxf/trunk/etc/eclipse/template.checkstyle-config.xml Fri Jan 4 07:47:28 2008
@@ -21,4 +21,7 @@
<check-configuration name="CXF Checks" location="@CHECKSTYLE_CONFIG_FILE@" type="external" description="">
<property name="apache.header.file" value="@APACHE_HEADER_FILE@"/>
</check-configuration>
+ <check-configuration name="CXF CORBA Checks" location="@CHECKSTYLE_CORBA_CONFIG_FILE@" type="external" description="">
+ <property name="apache.header.file" value="@APACHE_HEADER_FILE@"/>
+ </check-configuration>
</checkstyle-configurations>
Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Fri Jan 4 07:47:28 2008
@@ -59,6 +59,7 @@
<rhino.version>1.6R7</rhino.version>
<jdom.version>1.0</jdom.version>
<xmlbeans.version>2.2.0</xmlbeans.version>
+ <checkstyle.extension/>
<spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
@@ -156,13 +157,13 @@
<id>validate</id>
<phase>validate</phase>
<configuration>
- <configLocation>cxf-checkstyle.xml</configLocation>
+ <configLocation>cxf-checkstyle${checkstyle.extension}.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
<suppressionsLocation>cxf-checkstyle-suppressions.xml</suppressionsLocation>
<sourceDirectory>${basedir}/src</sourceDirectory>
- <excludes>**/archetype-resources/**/*.java</excludes>
+ <excludes>**/archetype-resources/**/*.java</excludes>
</configuration>
<goals>
<goal>checkstyle</goal>
@@ -902,7 +903,7 @@
<tasks>
<whichresource resource="/cxf-eclipse-pmd" property="pmd.url" />
<whichresource resource="/cxf-pmd-ruleset.xml" property="pmdruleset.url" />
- <whichresource resource="/cxf-eclipse-checkstyle" property="eclipse.checkstyle.url" />
+ <whichresource resource="/cxf-eclipse-checkstyle${checkstyle.extension}" property="eclipse.checkstyle.url" />
<get src="${pmdruleset.url}" dest=".ruleset" />
<get src="${pmd.url}" dest=".pmd" />
Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Fri Jan 4 07:47:28 2008
@@ -225,23 +225,27 @@
<whichresource resource="/cxf-pmd-ruleset.xml" property="pmdruleset.url" />
<whichresource resource="/cxf-eclipse-checkstyle" property="eclipse.checkstyle.url" />
<whichresource resource="/cxf-checkstyle.xml" property="checkstyle.url" />
+ <whichresource resource="/cxf-checkstyle-corba.xml" property="corba.checkstyle.url" />
<mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings" />
<mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle" />
<mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse" />
<get src="${checkstyle.url}" dest="${full.eclipse.workspace}/cxf-checkstyle.xml" />
+ <get src="${corba.checkstyle.url}" dest="${full.eclipse.workspace}/cxf-checkstyle-corba.xml" />
<!-- Add checkstyle config -->
<copy file="${basedir}/etc/eclipse/template.checkstyle-config.xml" tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" overwrite="no">
<filterset>
<filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/cxf-checkstyle.xml" />
+ <filter token="CHECKSTYLE_CORBA_CONFIG_FILE" value="${full.eclipse.workspace}/cxf-checkstyle-corba.xml" />
<filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt" />
</filterset>
</copy>
<xslt style="${basedir}/etc/eclipse/addcheckstyle.xsl" in="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" out="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new">
<param name="checkstyleconfig" expression="${full.eclipse.workspace}/cxf-checkstyle.xml" />
+ <param name="checkstyleconfigcorba" expression="${full.eclipse.workspace}/cxf-checkstyle-corba.xml" />
</xslt>
<copy file="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new" tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" overwrite="yes" />
Propchange: incubator/cxf/trunk/rt/bindings/corba/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 4 07:47:28 2008
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
+.wtpmodules
+
+
Modified: incubator/cxf/trunk/rt/bindings/corba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/pom.xml?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/corba/pom.xml Fri Jan 4 07:47:28 2008
@@ -20,103 +20,92 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>yoko-bindings</artifactId>
+ <artifactId>cxf-rt-bindings-corba</artifactId>
<packaging>jar</packaging>
- <name>Apache Yoko Bindings</name>
+ <name>Apache CXF Runtime CORBA Binding</name>
+ <url>http://cwiki.apache.org/CXF</url>
<parent>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- </parent>
-
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.1-incubator-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
<properties>
<file.url.prefix/>
- </properties>
+ <checkstyle.extension>-corba</checkstyle.extension>
+ </properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
+ <version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- <version>2.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>1.3</version>
</dependency>
</dependencies>
-
-
+
+
<build>
<plugins>
-
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-xsd</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
+ <id>generate-sources</id>
<phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-core</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+ <xsdOptions>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/schemas/wsdl/corba-binding.xsd</xsd>
+ <bindingFile>${basedir}/src/main/resources/schemas/wsdl/corba-binding.xjb</bindingFile>
+ <catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+ <deleteDirs>
+ <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
+ </deleteDirs>
+ </xsdOption>
+ </xsdOptions>
</configuration>
+ <goals>
+ <goal>xsdtojava</goal>
+ </goals>
</execution>
</executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
- <plugin>
+
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -133,35 +122,23 @@
<property name="test.resources.dir" location="${basedir}/src/test/resources" />
<mkdir dir="${generated.resources.test}/wsdl/type_test" />
- <xslt style="${test.resources.dir}/wsdl/type_test/type_test_ID_xsd.xsl"
- in="${test.resources.dir}/wsdl/type_test/type_test.xsd"
- out="${generated.resources.test}/wsdl/type_test/type_test_1.xsd">
+ <xslt style="${test.resources.dir}/wsdl/type_test/type_test_ID_xsd.xsl" in="${test.resources.dir}/wsdl/type_test/type_test.xsd" out="${generated.resources.test}/wsdl/type_test/type_test_1.xsd">
<param name="groupID" expression="1" />
</xslt>
- <xslt style="${test.resources.dir}/wsdl/type_test/type_test_ID_xsd.xsl"
- in="${test.resources.dir}/wsdl/type_test/type_test.xsd"
- out="${generated.resources.test}/wsdl/type_test/type_test_2.xsd">
+ <xslt style="${test.resources.dir}/wsdl/type_test/type_test_ID_xsd.xsl" in="${test.resources.dir}/wsdl/type_test/type_test.xsd" out="${generated.resources.test}/wsdl/type_test/type_test_2.xsd">
<param name="groupID" expression="2" />
</xslt>
- <xslt style="${test.resources.dir}/wsdl/type_test/type_test_ID_xsd.xsl"
- in="${test.resources.dir}/wsdl/type_test/type_test.xsd"
- out="${generated.resources.test}/wsdl/type_test/type_test_3.xsd">
+ <xslt style="${test.resources.dir}/wsdl/type_test/type_test_ID_xsd.xsl" in="${test.resources.dir}/wsdl/type_test/type_test.xsd" out="${generated.resources.test}/wsdl/type_test/type_test_3.xsd">
<param name="groupID" expression="3" />
</xslt>
- <xslt style="${test.resources.dir}/wsdl/type_test/type_test_wsdl.xsl"
- in="${test.resources.dir}/wsdl/type_test/type_test.xsd"
- out="${generated.resources.test}/wsdl/type_test/type_test_corba_inc.wsdl">
+ <xslt style="${test.resources.dir}/wsdl/type_test/type_test_wsdl.xsl" in="${test.resources.dir}/wsdl/type_test/type_test.xsd" out="${generated.resources.test}/wsdl/type_test/type_test_corba_inc.wsdl">
<param name="inc_xsd_path" expression="." />
<param name="use_style" expression="document" />
<param name="tns_suffix" expression="corba" />
</xslt>
<mkdir dir="${generated.src.test}/org/apache/type_test/corba" />
- <xslt style="${test.resources.dir}/wsdl/type_test/type_test_impl_java.xsl"
- in="${test.resources.dir}/wsdl/type_test/type_test.xsd"
- out="${generated.src.test}/org/apache/type_test/corba/TypeTestImpl.java" />
- <xslt style="${test.resources.dir}/wsdl/type_test/type_test_tester_java.xsl"
- in="${test.resources.dir}/wsdl/type_test/type_test.xsd"
- out="${generated.src.test}/org/apache/type_test/corba/TypeTestTester.java" />
+ <xslt style="${test.resources.dir}/wsdl/type_test/type_test_impl_java.xsl" in="${test.resources.dir}/wsdl/type_test/type_test.xsd" out="${generated.src.test}/org/apache/type_test/corba/TypeTestImpl.java" />
+ <xslt style="${test.resources.dir}/wsdl/type_test/type_test_tester_java.xsl" in="${test.resources.dir}/wsdl/type_test/type_test.xsd" out="${generated.src.test}/org/apache/type_test/corba/TypeTestTester.java" />
</tasks>
</configuration>
<goals>
@@ -196,9 +173,9 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>${stax.version}</version>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>${stax.version}</version>
</dependency>
</dependencies>
<executions>
@@ -220,7 +197,7 @@
<extraarg>-verbose</extraarg>
</extraargs>
</wsdltoidlOption>
- </wsdltoidlOptions>
+ </wsdltoidlOptions>
</configuration>
<goals>
<goal>wsdltoidl</goal>
@@ -230,24 +207,24 @@
<id>idltowsdl-generate-type-test-corba-binding</id>
<phase>process-test-sources</phase>
<configuration>
- <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+ <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<outputDir>${basedir}/target/generated/src/test/resources/wsdl/type_test</outputDir>
- <idltowsdlOptions>
+ <idltowsdlOptions>
<idltowsdlOption>
<idl>${basedir}/src/test/resources/idl/type_test/idltowsdl_type_test.idl</idl>
- <extraargs>
- <extraarg>-a</extraarg>
- <extraarg>corbaloc::localhost:40010/idltowsdl_type_test</extraarg>
- </extraargs>
+ <extraargs>
+ <extraarg>-a</extraarg>
+ <extraarg>corbaloc::localhost:40010/idltowsdl_type_test</extraarg>
+ </extraargs>
</idltowsdlOption>
- </idltowsdlOptions>
+ </idltowsdlOptions>
</configuration>
<goals>
<goal>idltowsdl</goal>
</goals>
- </execution>
+ </execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
@@ -265,6 +242,7 @@
</wsdl>
<extraargs>
<extraarg>-verbose</extraarg>
+ <extraarg>-quiet</extraarg>
</extraargs>
<dependencies>
<dependency>
@@ -345,6 +323,14 @@
<extraarg>-verbose</extraarg>
</extraargs>
</wsdlOption>
+ <wsdlOption>
+ <wsdl>
+ ${basedir}/src/test/resources/wsdl/PolyNestedObjRef.wsdl
+ </wsdl>
+ <extraargs>
+ <extraarg>-verbose</extraarg>
+ </extraargs>
+ </wsdlOption>
</wsdlOptions>
</configuration>
<goals>
@@ -420,54 +406,21 @@
</goals>
</execution>
</executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- also need to provide the endorsed dirs as an argLine for the object
- reference test client side -->
- <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
- <systemProperties>
- <property>
- <name>java.endorsed.dirs</name>
- <value>${basedir}/target/endorsed</value>
- </property>
- <!--
- <property>
- <name>DEBUG</name>
- <value>true</value>
- </property>
- -->
- <property>
- <name>java.util.logging.config.file</name>
- <value>${basedir}/target/test-classes/logging.properties</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
+ </plugin-->
</plugins>
</build>
-
+
<profiles>
<profile>
- <id>default</id>
- <activation>
- <os>
- <family>windows</family>
- </os>
- </activation>
- <properties>
- <file.url.prefix>file:///</file.url.prefix>
- </properties>
+ <id>default</id>
+ <activation>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+ <properties>
+ <file.url.prefix>file:///</file.url.prefix>
+ </properties>
</profile>
</profiles>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/yoko/trunk/bindings</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/incubator/yoko/trunk/bindings</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings</url>
- </scm>
-
</project>
Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingException.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingException.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingException.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaBindingFactory.java Fri Jan 4 07:47:28 2008
@@ -20,11 +20,9 @@
package org.apache.yoko.bindings.corba;
import java.io.IOException;
-import java.util.Collection;
import java.util.List;
import java.util.Set;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import org.apache.cxf.binding.AbstractBindingFactory;
@@ -39,10 +37,8 @@
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.ConduitInitiator;
-import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -56,7 +52,6 @@
public class CorbaBindingFactory extends AbstractBindingFactory
implements ConduitInitiator, DestinationFactory {
- private Collection<String> activationNamespaces;
private List<String> transportIds;
private OrbConfig orbConfig = new OrbConfig();
@@ -68,22 +63,6 @@
@Resource(name = "orbSingletonClass")
public void setOrbSingletonClass(String cls) {
orbConfig.setOrbSingletonClass(cls);
- }
-
- @PostConstruct
- void registerWithBindingManager() {
- ConduitInitiatorManager cim = getBus().getExtension(ConduitInitiatorManager.class);
- if (null != cim) {
- for (String ns : activationNamespaces) {
- cim.registerConduitInitiator(ns, this);
- }
- }
- DestinationFactoryManager dfm = getBus().getExtension(DestinationFactoryManager.class);
- if (null != dfm) {
- for (String ns : activationNamespaces) {
- dfm.registerDestinationFactory(ns, this);
- }
- }
}
public Binding createBinding(BindingInfo bindingInfo) {
Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaConduit.java Fri Jan 4 07:47:28 2008
@@ -93,7 +93,6 @@
LOG.log(Level.SEVERE, "Unable to locate a valid CORBA address");
throw new CorbaBindingException("Unable to locate a valid CORBA address");
}
- List args = message.getContent(List.class);
String ref = (String)message.get(Message.ENDPOINT_ADDRESS);
org.omg.CORBA.Object targetObject;
// A non-null endpoint address from the message means that we want to invoke on a particular
Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaMessage.java Fri Jan 4 07:47:28 2008
@@ -44,8 +44,6 @@
private NVList list;
- private Map<Class<?>, Object> contents = new HashMap<Class<?>, Object>();
-
public CorbaMessage(Message m) {
super(m);
if (m instanceof CorbaMessage) {
@@ -87,7 +85,7 @@
systemExcept = sysEx;
}
- public void addStreamableArgument(CorbaStreamable arg) {
+ public final void addStreamableArgument(CorbaStreamable arg) {
if (this.arguments == null) {
this.arguments = new ArrayList<CorbaStreamable>(1);
}
@@ -100,7 +98,7 @@
}
- public void setStreamableArguments(CorbaStreamable[] data) {
+ public final void setStreamableArguments(CorbaStreamable[] data) {
if (this.arguments == null) {
this.arguments = new ArrayList<CorbaStreamable>(data.length);
}
Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaServerConduit.java Fri Jan 4 07:47:28 2008
@@ -46,12 +46,11 @@
import org.omg.CORBA.ORB;
import org.omg.CORBA.ServerRequest;
-public class CorbaServerConduit implements Conduit {
+public final class CorbaServerConduit implements Conduit {
private static final Logger LOG = LogUtils.getL7dLogger(CorbaServerConduit.class);
private EndpointInfo endpointInfo;
private EndpointReferenceType target;
- private MessageObserver incomingObserver;
private ORB orb;
private CorbaTypeMap typeMap;
@@ -67,13 +66,17 @@
public void prepare(Message message) throws IOException {
try {
- AddressType address = endpointInfo.getExtensor(AddressType.class);
-
- if (address == null) {
- LOG.log(Level.SEVERE, "Unable to locate a valid CORBA address");
- throw new CorbaBindingException("Unable to locate a valid CORBA address");
- }
- org.omg.CORBA.Object targetObject = CorbaUtils.importObjectReference(orb, address.getLocation());
+ String location = endpointInfo.getAddress();
+ if (location == null) {
+ AddressType address = endpointInfo.getExtensor(AddressType.class);
+
+ if (address == null) {
+ LOG.log(Level.SEVERE, "Unable to locate a valid CORBA address");
+ throw new CorbaBindingException("Unable to locate a valid CORBA address");
+ }
+ location = address.getLocation();
+ }
+ org.omg.CORBA.Object targetObject = CorbaUtils.importObjectReference(orb, location);
message.put(CorbaConstants.ORB, orb);
message.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, targetObject);
message.setContent(OutputStream.class,
@@ -102,7 +105,7 @@
}
public void setMessageObserver(MessageObserver observer) {
- incomingObserver = observer;
+ //NOTHING
}
public EndpointReferenceType getTargetReference(EndpointReferenceType t) {
@@ -165,10 +168,7 @@
private class CorbaOutputStream extends CachedOutputStream {
- private Message outMessage;
-
CorbaOutputStream(Message m) {
- outMessage = m;
}
/**
Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaStreamable.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaTypeMap.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaTypeMap.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaTypeMap.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/CorbaTypeMap.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -35,7 +35,6 @@
public class CorbaTypeMap {
private String targetNamespace;
- private String prefix;
private Map<String, CorbaTypeImpl> typeMap;
private Map<QName, TypeCode> typeCodeMap;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/TypeMapCache.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/TypeMapCache.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/TypeMapCache.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/TypeMapCache.java Fri Jan 4 07:47:28 2008
@@ -1,18 +1,18 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamFaultInInterceptor.java?rev=608894&r1=608893&r2=608894&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamFaultInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/yoko/bindings/corba/interceptors/CorbaStreamFaultInInterceptor.java Fri Jan 4 07:47:28 2008
@@ -29,15 +29,23 @@
import javax.xml.stream.XMLStreamReader;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.databinding.DataReader;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.ClientFaultConverter;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.FaultInfo;
+import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.service.model.ServiceModelUtil;
@@ -45,7 +53,6 @@
import org.apache.yoko.bindings.corba.CorbaBindingException;
import org.apache.yoko.bindings.corba.CorbaMessage;
import org.apache.yoko.bindings.corba.CorbaStreamable;
-import org.apache.yoko.bindings.corba.CorbaTypeMap;
import org.apache.yoko.bindings.corba.runtime.CorbaStreamReader;
import org.apache.yoko.bindings.corba.types.CorbaHandlerUtils;
import org.apache.yoko.bindings.corba.types.CorbaTypeEventProducer;
@@ -65,7 +72,10 @@
public void handleMessage(Message msg) {
CorbaMessage message = (CorbaMessage)msg;
+
+
try {
+
SystemException sysEx = message.getSystemException();
if (sysEx != null) {
// TODO: Do we need anything else to handle system exceptions here...i.e. do
@@ -80,12 +90,9 @@
BindingOperationInfo bopInfo = message.getExchange().get(BindingOperationInfo.class);
OperationInfo opInfo = bopInfo.getOperationInfo();
-
- CorbaMessage outMessage = (CorbaMessage)message.getExchange().getOutMessage();
-
+
ServiceInfo service = message.getExchange().get(ServiceInfo.class);
- CorbaTypeMap typeMap = outMessage.getCorbaTypeMap();
-
+
org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) message.get(CorbaConstants.ORB);
if (orb == null) {
orb = (org.omg.CORBA.ORB) message.getExchange().get(org.omg.CORBA.ORB.class);
@@ -102,10 +109,19 @@
Object e = reader.read(fault.getMessageParts().get(0), streamReader);
if (!(e instanceof Exception)) {
Class exClass = fault.getProperty(Class.class.getName(), Class.class);
- Class beanClass = e.getClass();
- Constructor constructor =
- exClass.getConstructor(new Class[]{String.class, beanClass});
- e = constructor.newInstance(new Object[]{"", e});
+ if (exClass != null) {
+ Class beanClass = e.getClass();
+ Constructor constructor =
+ exClass.getConstructor(new Class[]{String.class, beanClass});
+ e = constructor.newInstance(new Object[]{"", e});
+ } else {
+ // Get the Fault
+ Fault faultEx = (Fault) message.getContent(Exception.class);
+ if (e instanceof Document) {
+ createFaultDetail((Document)e, fault, faultEx);
+ }
+ e = faultEx;
+ }
}
message.setContent(Exception.class, (Exception) e);
}
@@ -116,11 +132,38 @@
}
+ private void createFaultDetail(Document faultData, FaultInfo faultInfo, Fault faultEx) {
+ MessagePartInfo partInfo = faultInfo.getMessageParts().get(0);
+ QName partInfoName = partInfo.getElementQName();
+ Document faultDoc = DOMUtils.createDocument();
+ Element faultElement = faultDoc.createElement("detail");
+ faultDoc.appendChild(faultElement);
+ Element partElement =
+ faultDoc.createElementNS(partInfoName.getNamespaceURI(), partInfoName.getLocalPart());
+
+ Element faultDataElement = (Element) faultData.getFirstChild();
+
+ NodeList nodeList = faultDataElement.getChildNodes();
+
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node importedFaultData = faultDoc.
+ importNode(nodeList.item(i), true);
+ partElement.appendChild(importedFaultData);
+ }
+ faultElement.appendChild(partElement);
+ faultEx.setDetail(faultElement);
+ }
+
+
protected FaultInfo getFaultInfo(OperationInfo opInfo, QName faultName) {
Iterator<FaultInfo> faults = opInfo.getFaults().iterator();
while (faults.hasNext()) {
FaultInfo fault = faults.next();
- if (fault.getFaultName().getLocalPart().equals(faultName.getLocalPart())) {
+ MessagePartInfo partInfo = fault.getMessageParts().get(0);
+ if (partInfo.isElement()
+ && partInfo.getElementQName().getLocalPart().equals(faultName.getLocalPart())) {
+ return fault;
+ } else if (partInfo.getTypeQName().getLocalPart().equals(faultName.getLocalPart())) {
return fault;
}
}