Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8179CD1B5 for ; Thu, 30 May 2013 18:56:47 +0000 (UTC) Received: (qmail 47212 invoked by uid 500); 30 May 2013 18:56:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 47164 invoked by uid 500); 30 May 2013 18:56:47 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 47157 invoked by uid 99); 30 May 2013 18:56:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 May 2013 18:56:47 +0000 X-ASF-Spam-Status: No, hits=-1998.0 required=5.0 tests=ALL_TRUSTED,FB_GET_MEDS X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 May 2013 18:56:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 86A372388906; Thu, 30 May 2013 18:56:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1487975 [1/2] - in /cxf/branches/dkulp-nowsdl4j: api/ api/src/main/java/org/apache/cxf/binding/ api/src/main/java/org/apache/cxf/endpoint/ api/src/main/java/org/apache/cxf/helpers/ api/src/main/java/org/apache/cxf/interceptor/ api/src/main... Date: Thu, 30 May 2013 18:56:18 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130530185621.86A372388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu May 30 18:56:16 2013 New Revision: 1487975 URL: http://svn.apache.org/r1487975 Log: Remove wsdl4j stuff from API, nothing beyond API compiles/tests yet. Added: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointUtilsException.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/AbstractCXFTest.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/TestApplicationContext.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/TestUtilities.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/XPathAssert.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/wsdl/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/wsdl/UsingAddressing.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/wsdl/UsingAddressing.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/wsdl/jaxb.index - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/wsdl/jaxb.index cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/Messages.properties - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/Messages.properties cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSAEndpointReferenceUtils.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSAEndpointReferenceUtils.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLBuilder.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLBuilder.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensionLoader.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLExtensionLoader.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/helpers/WSDLHelper.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLLibrary.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLLibrary.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/WSDLBindingFactory.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/Messages.properties - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLRuntimeException.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLRuntimeException.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java - copied, changed from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java Removed: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/helpers/WSDLHelper.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/wsdl/UsingAddressing.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/wsdl/jaxb.index cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointUtilsException.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/Messages.properties cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSAEndpointReferenceUtils.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLBuilder.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLExtensionLoader.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLLibrary.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java cxf/branches/dkulp-nowsdl4j/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java cxf/branches/dkulp-nowsdl4j/api/src/test/resources/schemas/wsdl/test-conf.xjb cxf/branches/dkulp-nowsdl4j/api/src/test/resources/schemas/wsdl/test-conf.xsd cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLRuntimeException.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceUtils.java Modified: cxf/branches/dkulp-nowsdl4j/api/pom.xml cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java Modified: cxf/branches/dkulp-nowsdl4j/api/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/pom.xml?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/pom.xml (original) +++ cxf/branches/dkulp-nowsdl4j/api/pom.xml Thu May 30 18:56:16 2013 @@ -158,10 +158,6 @@ test - wsdl4j - wsdl4j - - org.osgi org.osgi.core @@ -248,27 +244,6 @@ - - generate-test-sources - generate-test-sources - - xsdtojava-tests - - - ${basedir}/target/generated/src/test/java - - - ${basedir}/src/test/resources/schemas/wsdl/test-conf.xsd - ${basedir}/src/test/resources/schemas/wsdl/test-conf.xjb - ${basedir}/src/main/build-resources/catalog.cat - - ${basedir}/target/generated/src/test/java/org/apache/cxf/wsdl - - - - - - Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java Thu May 30 18:56:16 2013 @@ -21,112 +21,99 @@ package org.apache.cxf.binding; import java.util.Collection; -import javax.wsdl.Binding; -import javax.wsdl.BindingFault; -import javax.wsdl.BindingInput; -import javax.wsdl.BindingOperation; -import javax.wsdl.BindingOutput; -import javax.wsdl.extensions.ElementExtensible; -import javax.wsdl.extensions.ExtensibilityElement; +import javax.annotation.Resource; import javax.xml.namespace.QName; import org.apache.cxf.Bus; -import org.apache.cxf.service.model.AbstractPropertiesHolder; +import org.apache.cxf.endpoint.Endpoint; +import org.apache.cxf.service.Service; import org.apache.cxf.service.model.BindingInfo; -import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.ServiceInfo; +import org.apache.cxf.transport.ChainInitiationObserver; +import org.apache.cxf.transport.Destination; -import static org.apache.cxf.helpers.CastUtils.cast; +public abstract class AbstractBindingFactory implements BindingFactory { -public abstract class AbstractBindingFactory extends AbstractBaseBindingFactory - implements WSDLBindingFactory { + protected Collection activationNamespaces; + + protected Bus bus; public AbstractBindingFactory() { } public AbstractBindingFactory(Collection ns) { - super(ns); + activationNamespaces = ns; } - public AbstractBindingFactory(Bus b) { - super(b); + bus = b; + registerWithBindingManager(); } public AbstractBindingFactory(Bus b, Collection ns) { - super(b, ns); + activationNamespaces = ns; + bus = b; + registerWithBindingManager(); } - + private void registerWithBindingManager() { + if (bus != null && activationNamespaces != null) { + BindingFactoryManager manager = bus.getExtension(BindingFactoryManager.class); + for (String ns : activationNamespaces) { + manager.registerBindingFactory(ns, this); + } + } + } + /** - * Copies extensors from the Binding to BindingInfo. - * @param service - * @param binding - * @param ns + * Creates a "default" BindingInfo object for the service. Called by + * createBindingInfo(Service service, String binding, Object config) to actually + * create the BindingInfo. Can return a subclass which can then process + * the extensors within the subclass. */ - public BindingInfo createBindingInfo(ServiceInfo service, Binding binding, String ns) { - - BindingInfo bi = createBindingInfo(service, ns, null); - return initializeBindingInfo(service, binding, bi); + public BindingInfo createBindingInfo(ServiceInfo service, String namespace, Object config) { + return new BindingInfo(service, namespace); } - protected BindingInfo initializeBindingInfo(ServiceInfo service, Binding binding, BindingInfo bi) { - bi.setName(binding.getQName()); - copyExtensors(bi, binding, null); - - for (BindingOperation bop : cast(binding.getBindingOperations(), BindingOperation.class)) { - String inName = null; - String outName = null; - if (bop.getBindingInput() != null) { - inName = bop.getBindingInput().getName(); - } - if (bop.getBindingOutput() != null) { - outName = bop.getBindingOutput().getName(); - } - String portTypeNs = binding.getPortType().getQName().getNamespaceURI(); - QName opName = new QName(portTypeNs, - bop.getName()); - BindingOperationInfo bop2 = bi.getOperation(opName); - if (bop2 == null) { - bop2 = bi.buildOperation(opName, inName, outName); - if (bop2 != null) { - bi.addOperation(bop2); - } - } - if (bop2 != null) { - copyExtensors(bop2, bop, bop2); - if (bop.getBindingInput() != null) { - copyExtensors(bop2.getInput(), bop.getBindingInput(), bop2); - } - if (bop.getBindingOutput() != null) { - copyExtensors(bop2.getOutput(), bop.getBindingOutput(), bop2); - } - for (BindingFault f : cast(bop.getBindingFaults().values(), BindingFault.class)) { - copyExtensors(bop2.getFault(new QName(service.getTargetNamespace(), f.getName())), - bop.getBindingFault(f.getName()), bop2); - } - } + /** + * Creates a "default" BindingInfo object for the service. Can return a subclass + * which can then process the extensors within the subclass. By default, just + * creates it for the first ServiceInfo in the service + */ + public BindingInfo createBindingInfo(Service service, String namespace, Object config) { + BindingInfo bi = createBindingInfo(service.getServiceInfos().get(0), namespace, config); + if (bi.getName() == null) { + bi.setName(new QName(service.getName().getNamespaceURI(), + service.getName().getLocalPart() + "Binding")); } return bi; } - private void copyExtensors(AbstractPropertiesHolder info, ElementExtensible extElement, - BindingOperationInfo bop) { - if (info != null) { - for (ExtensibilityElement ext : cast(extElement.getExtensibilityElements(), - ExtensibilityElement.class)) { - info.addExtensor(ext); - if (bop != null && extElement instanceof BindingInput) { - addMessageFromBinding(ext, bop, true); - } - if (bop != null && extElement instanceof BindingOutput) { - addMessageFromBinding(ext, bop, false); - } - } + + public void addListener(Destination d, Endpoint e) { + ChainInitiationObserver observer = new ChainInitiationObserver(e, bus); + + d.setMessageObserver(observer); + } + + public Bus getBus() { + return bus; + } + + @Resource + public void setBus(Bus bus) { + if (this.bus != bus) { + this.bus = bus; + registerWithBindingManager(); } } - protected void addMessageFromBinding(ExtensibilityElement ext, BindingOperationInfo bop, - boolean isInput) { + public Collection getActivationNamespaces() { + return activationNamespaces; + } + + public void setActivationNamespaces(Collection activationNamespaces) { + this.activationNamespaces = activationNamespaces; + registerWithBindingManager(); } } Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Thu May 30 18:56:16 2013 @@ -23,7 +23,6 @@ import java.io.Closeable; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.net.URL; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -36,8 +35,6 @@ import java.util.concurrent.Executor; import java.util.logging.Level; import java.util.logging.Logger; -import javax.wsdl.extensions.soap.SOAPBinding; -import javax.wsdl.extensions.soap12.SOAP12Binding; import javax.xml.namespace.QName; import org.apache.cxf.Bus; @@ -74,7 +71,6 @@ import org.apache.cxf.service.model.Serv import org.apache.cxf.transport.Conduit; import org.apache.cxf.transport.MessageObserver; import org.apache.cxf.workqueue.SynchronousExecutor; -import org.apache.cxf.wsdl.WSDLServiceFactory; public class ClientImpl extends AbstractBasicInterceptorProvider @@ -118,57 +114,6 @@ public class ClientImpl getConduitSelector(sc).setEndpoint(e); notifyLifecycleManager(); } - - public ClientImpl(URL wsdlUrl) { - this(BusFactory.getThreadDefaultBus(), wsdlUrl, (QName)null, - null, SimpleEndpointImplFactory.getSingleton()); - } - - public ClientImpl(URL wsdlUrl, QName port) { - this(BusFactory.getThreadDefaultBus(), wsdlUrl, (QName)null, - port, SimpleEndpointImplFactory.getSingleton()); - } - - /** - * Create a Client that uses the default EndpointImpl. - * @param bus - * @param wsdlUrl - * @param service - * @param port - */ - public ClientImpl(Bus bus, URL wsdlUrl, QName service, QName port) { - this(bus, wsdlUrl, service, port, SimpleEndpointImplFactory.getSingleton()); - } - - /** - * Create a Client that uses a specific EndpointImpl. - * @param bus - * @param wsdlUrl - * @param service - * @param port - * @param endpointImplFactory - */ - public ClientImpl(Bus bus, URL wsdlUrl, QName service, - QName port, EndpointImplFactory endpointImplFactory) { - this.bus = bus; - outFaultObserver = new ClientOutFaultObserver(bus); - - Service svc = service == null - ? bus.getExtension(WSDLServiceFactory.class).create(wsdlUrl) - : bus.getExtension(WSDLServiceFactory.class).create(wsdlUrl, service); - EndpointInfo epfo = findEndpoint(svc, port); - - try { - if (endpointImplFactory != null) { - getConduitSelector().setEndpoint(endpointImplFactory.newEndpointImpl(bus, svc, epfo)); - } else { - getConduitSelector().setEndpoint(new EndpointImpl(bus, svc, epfo)); - } - } catch (EndpointException epex) { - throw new IllegalStateException("Unable to create endpoint: " + epex.getMessage(), epex); - } - notifyLifecycleManager(); - } /** * Create a Client that uses a specific EndpointImpl. @@ -255,24 +200,16 @@ public class ClientImpl for (EndpointInfo e : svcfo.getEndpoints()) { BindingInfo bfo = e.getBinding(); String bid = bfo.getBindingId(); - if ("http://schemas.xmlsoap.org/wsdl/soap/".equals(bid)) { - for (Object o : bfo.getExtensors().get()) { - if (o instanceof SOAPBinding) { - SOAPBinding soapB = (SOAPBinding)o; - if ("http://schemas.xmlsoap.org/soap/http".equals(soapB.getTransportURI())) { - epfo = e; - break; - } - } - } - } else if ("http://schemas.xmlsoap.org/wsdl/soap12/".equals(bid)) { + if ("http://schemas.xmlsoap.org/wsdl/soap/".equals(bid) + || "http://schemas.xmlsoap.org/wsdl/soap12/".equals(bid)) { for (Object o : bfo.getExtensors().get()) { - if (o instanceof SOAP12Binding) { - SOAP12Binding soapB = (SOAP12Binding)o; - if ("http://schemas.xmlsoap.org/soap/http".equals(soapB.getTransportURI())) { - epfo = e; - break; + try { + String s = (String)o.getClass().getMethod("getTransportURI").invoke(o); + if (s != null && s.endsWith("http")) { + return e; } + } catch (Throwable t) { + //ignore } } } @@ -280,7 +217,7 @@ public class ClientImpl } if (epfo == null) { throw new UnsupportedOperationException( - "Only document-style SOAP 1.1 http are supported " + "Only document-style SOAP 1.1 and 1.2 http are supported " + "for auto-selection of endpoint; none were found."); } } Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java Thu May 30 18:56:16 2013 @@ -49,7 +49,7 @@ import org.apache.cxf.service.model.Oper import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.service.model.ServiceModelUtil; import org.apache.cxf.staxutils.DepthXMLStreamReader; -import org.apache.cxf.wsdl.EndpointReferenceUtils; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInterceptor { public static final String NO_VALIDATE_PARTS = AbstractInDatabindingInterceptor.class.getName() Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java Thu May 30 18:56:16 2013 @@ -45,7 +45,7 @@ import org.apache.cxf.service.model.Mess import org.apache.cxf.service.model.OperationInfo; import org.apache.cxf.staxutils.CachingXmlEventWriter; import org.apache.cxf.staxutils.StaxUtils; -import org.apache.cxf.wsdl.EndpointReferenceUtils; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInterceptor { Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java Thu May 30 18:56:16 2013 @@ -22,7 +22,7 @@ package org.apache.cxf.service.model; import javax.xml.namespace.QName; import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.wsdl.WSAEndpointReferenceUtils; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; /** * The EndpointInfo contains the information for a web service 'port' inside of a service. @@ -94,9 +94,9 @@ public class EndpointInfo extends Abstra public void setAddress(String addr) { if (null == address) { - address = WSAEndpointReferenceUtils.getEndpointReference(addr); + address = EndpointReferenceUtils.getEndpointReference(addr); } else { - WSAEndpointReferenceUtils.setAddress(address, addr); + EndpointReferenceUtils.setAddress(address, addr); } } Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java Thu May 30 18:56:16 2013 @@ -26,7 +26,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.message.Message; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.wsdl.WSAEndpointReferenceUtils; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; /** * Abstract base class factoring out common Destination logic, @@ -95,7 +95,7 @@ public abstract class AbstractDestinatio protected abstract class AbstractBackChannelConduit extends AbstractConduit { public AbstractBackChannelConduit() { - super(WSAEndpointReferenceUtils.getAnonymousEndpointReference()); + super(EndpointReferenceUtils.getAnonymousEndpointReference()); } /** Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java Thu May 30 18:56:16 2013 @@ -27,8 +27,8 @@ import org.apache.cxf.Bus; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.addressing.EndpointReferenceType; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; import org.apache.cxf.ws.addressing.ReferenceParametersType; -import org.apache.cxf.wsdl.EndpointReferenceUtils; import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND; public abstract class AbstractMultiplexDestination extends AbstractDestination implements Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java Thu May 30 18:56:16 2013 @@ -25,7 +25,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.ws.addressing.AttributedURIType; import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.wsdl.EndpointReferenceUtils; +import org.apache.cxf.ws.addressing.EndpointReferenceUtils; public abstract class AbstractObservable implements Observable { Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Thu May 30 18:56:16 2013 @@ -45,7 +45,6 @@ import org.apache.cxf.transport.ConduitI import org.apache.cxf.transport.ConduitInitiatorManager; import org.apache.cxf.transport.Destination; import org.apache.cxf.transport.MessageObserver; -import org.apache.cxf.wsdl.EndpointReferenceUtils; import static org.apache.cxf.message.Message.ASYNC_POST_RESPONSE_DISPATCH; import static org.apache.cxf.message.Message.REQUESTOR_ROLE; Copied: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java?p2=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java Thu May 30 18:56:16 2013 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.wsdl; +package org.apache.cxf.ws.addressing; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -37,10 +37,6 @@ import java.util.concurrent.atomic.Atomi import java.util.logging.Level; import java.util.logging.Logger; -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.WSDLException; import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; @@ -67,11 +63,9 @@ import org.xml.sax.InputSource; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; -import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.i18n.Message; import org.apache.cxf.common.jaxb.JAXBContextCache; import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.common.xmlschema.LSInputImpl; import org.apache.cxf.endpoint.EndpointResolverRegistry; import org.apache.cxf.endpoint.Server; @@ -87,10 +81,6 @@ import org.apache.cxf.staxutils.StaxUtil import org.apache.cxf.staxutils.W3CDOMStreamWriter; import org.apache.cxf.transport.Destination; import org.apache.cxf.transport.MultiplexDestination; -import org.apache.cxf.ws.addressing.AttributedURIType; -import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.ws.addressing.JAXWSAConstants; -import org.apache.cxf.ws.addressing.MetadataType; import org.apache.cxf.ws.addressing.wsdl.AttributedQNameType; import org.apache.cxf.ws.addressing.wsdl.ServiceNameType; import org.apache.ws.commons.schema.XmlSchema; @@ -235,7 +225,7 @@ public final class EndpointReferenceUtil } } - public static final String ANONYMOUS_ADDRESS = WSAEndpointReferenceUtils.ANONYMOUS_ADDRESS; + public static final String ANONYMOUS_ADDRESS = "http://www.w3.org/2005/08/addressing/anonymous"; private static final Logger LOG = LogUtils.getL7dLogger(EndpointReferenceUtils.class); @@ -270,9 +260,9 @@ public final class EndpointReferenceUtil = new AtomicReference>(new SoftReference(null)); static { ADDRESSING_CLASSES.add(WSA_WSDL_OBJECT_FACTORY.getClass()); - ADDRESSING_CLASSES.add(WSAEndpointReferenceUtils.WSA_OBJECT_FACTORY.getClass()); + ADDRESSING_CLASSES.add(org.apache.cxf.ws.addressing.ObjectFactory.class); } - + private EndpointReferenceUtils() { // Utility class - never constructed } @@ -288,12 +278,22 @@ public final class EndpointReferenceUtil String portName) { if (null != serviceName) { JAXBElement jaxbElement = getServiceNameType(serviceName, portName); - MetadataType mt = WSAEndpointReferenceUtils.getSetMetadata(ref); + MetadataType mt = getSetMetadata(ref); mt.getAny().add(jaxbElement); } } + + public static MetadataType getSetMetadata(EndpointReferenceType ref) { + MetadataType mt = ref.getMetadata(); + if (null == mt) { + mt = new MetadataType(); + ref.setMetadata(mt); + } + return mt; + } + public static JAXBElement getServiceNameType(QName serviceName, String portName) { ServiceNameType serviceNameType = WSA_WSDL_OBJECT_FACTORY.createServiceNameType(); serviceNameType.setValue(serviceName); @@ -327,9 +327,6 @@ public final class EndpointReferenceUtil String service = content; if (content.contains(":")) { namespaceURI = getNameSpaceUri(node, content, namespaceURI); - if (StringUtils.isEmpty(namespaceURI)) { - namespaceURI = findNamespaceHack(ref, bus); - } service = getService(content); } else { Node nodeAttr = node.getAttributes().getNamedItem("xmlns"); @@ -425,7 +422,7 @@ public final class EndpointReferenceUtil JAXBElement jaxbElement = WSA_WSDL_OBJECT_FACTORY.createInterfaceName(interfaceNameType); - MetadataType mt = WSAEndpointReferenceUtils.getSetMetadata(ref); + MetadataType mt = getSetMetadata(ref); mt.getAny().add(jaxbElement); } } @@ -447,9 +444,6 @@ public final class EndpointReferenceUtil //String service = content; if (content.contains(":")) { namespaceURI = getNameSpaceUri(node, content, namespaceURI); - if (StringUtils.isEmpty(namespaceURI)) { - namespaceURI = findNamespaceHack(ref, bus); - } content = getService(content); } else { Node nodeAttr = node.getAttributes().getNamedItem("xmlns"); @@ -471,37 +465,9 @@ public final class EndpointReferenceUtil return null; } - private static String findNamespaceHack(EndpointReferenceType ref, Bus bus) { - //probably a broken version of Xalan, we'll have to - //try a hack to figure out the namespace as xalan - //dropped the namespace declaration so there isn't - //a way to map the namespace prefix to the real namespace. - //This is fixed in xalan 2.7.1, but older versions may - //be used - if (bus == null) { - return ""; - } - String wsdlLocation = getWSDLLocation(ref); - if (StringUtils.isEmpty(wsdlLocation)) { - return ""; - } - if (bus != null) { - WSDLManager manager = bus.getExtension(WSDLManager.class); - if (manager != null) { - try { - Definition def = manager.getDefinition(wsdlLocation); - return def.getTargetNamespace(); - } catch (WSDLException e) { - //ignore - } - } - } - return ""; - } - public static void setWSDLLocation(EndpointReferenceType ref, String... wsdlLocation) { - MetadataType metadata = WSAEndpointReferenceUtils.getSetMetadata(ref); + MetadataType metadata = getSetMetadata(ref); //wsdlLocation attribute is a list of anyURI. StringBuilder strBuf = new StringBuilder(); @@ -543,7 +509,7 @@ public final class EndpointReferenceUtil throws EndpointUtilsException { if (null != ref) { - MetadataType mt = WSAEndpointReferenceUtils.getSetMetadata(ref); + MetadataType mt = getSetMetadata(ref); List anyList = mt.getAny(); try { for (Source source : metadata) { @@ -592,41 +558,6 @@ public final class EndpointReferenceUtil } } } - - /** - * Gets the WSDL definition for the provided endpoint reference. - * @param manager - the WSDL manager - * @param ref - the endpoint reference - * @return Definition the wsdl definition - * @throws WSDLException - */ - public static Definition getWSDLDefinition(WSDLManager manager, EndpointReferenceType ref) - throws WSDLException { - - if (null == manager) { - return null; - } - - MetadataType metadata = ref.getMetadata(); - String location = getWSDLLocation(ref); - - if (null != location) { - //Pick up the first url to obtain the wsdl defintion - return manager.getDefinition(location); - } - - for (Object obj : metadata.getAny()) { - if (obj instanceof Element) { - Element el = (Element)obj; - if (StringUtils.isEqualUri(el.getNamespaceURI(), WSDLConstants.NS_WSDL11) - && "definitions".equals(el.getLocalName())) { - return manager.getDefinition(el); - } - } - } - - return null; - } private static synchronized Schema createSchema(ServiceInfo serviceInfo, Bus b) { @@ -748,98 +679,16 @@ public final class EndpointReferenceUtil /** - * Gets the WSDL port for the provided endpoint reference. - * @param manager - the WSDL manager - * @param ref - the endpoint reference - * @return Port the wsdl port - * @throws WSDLException - */ - public static Port getPort(WSDLManager manager, EndpointReferenceType ref) throws WSDLException { - - Definition def = getWSDLDefinition(manager, ref); - if (def == null) { - throw new WSDLException(WSDLException.OTHER_ERROR, "unable to find definition for reference"); - } - - MetadataType metadata = ref.getMetadata(); - for (Object obj : metadata.getAny()) { - - if (obj instanceof JAXBElement) { - Object jaxbVal = ((JAXBElement)obj).getValue(); - - if (jaxbVal instanceof ServiceNameType) { - Port port = null; - ServiceNameType snt = (ServiceNameType)jaxbVal; - if (LOG.isLoggable(Level.FINEST)) { - LOG.log(Level.FINEST, "found service name " + snt.getValue().getLocalPart()); - } - Service service = def.getService(snt.getValue()); - if (service == null) { - LOG.log(Level.WARNING, "can't find the service name [" - + snt.getValue() - + "], using the default service name in wsdl"); - service = (Service)def.getServices().values().iterator().next(); - if (service == null) { - return null; - } - } - String endpoint = snt.getEndpointName(); - if ("".equals(endpoint) && service.getPorts().size() == 1) { - port = (Port)service.getPorts().values().iterator().next(); - } else { - port = service.getPort(endpoint); - } - // FIXME this needs to be looked at service.getPort(endpoint) - //should not return null when endpoint is valid - if (port == null) { - LOG.log(Level.WARNING, "can't find the port name [" - + endpoint - + "], using the default port name in wsdl"); - port = (Port)service.getPorts().values().iterator().next(); - } - return port; - } - } - } - - if (def.getServices().size() == 1) { - Service service = (Service)def.getServices().values().iterator().next(); - if (service.getPorts().size() == 1) { - return (Port)service.getPorts().values().iterator().next(); - } - } - - QName serviceName = getServiceName(ref, null); - if (null != serviceName) { - if (StringUtils.isEmpty(serviceName.getNamespaceURI())) { - serviceName = new QName(def.getTargetNamespace(), serviceName.getLocalPart()); - } - Service service = def.getService(serviceName); - if (service == null) { - throw new WSDLException(WSDLException.OTHER_ERROR, "Cannot find service for " + serviceName); - } - if (service.getPorts().size() == 1) { - return (Port)service.getPorts().values().iterator().next(); - } - String str = getPortName(ref); - LOG.log(Level.FINE, "getting port " + str + " from service " + service.getQName()); - Port port = service.getPort(str); - if (port == null) { - throw new WSDLException(WSDLException.OTHER_ERROR, "unable to find port " + str); - } - return port; - } - // TODO : throw exception here - return null; - } - - /** * Get the address from the provided endpoint reference. * @param ref - the endpoint reference * @return String the address of the endpoint */ public static String getAddress(EndpointReferenceType ref) { - return WSAEndpointReferenceUtils.getAddress(ref); + AttributedURIType a = ref.getAddress(); + if (null != a) { + return a.getValue(); + } + return null; } /** @@ -848,7 +697,9 @@ public final class EndpointReferenceUtil * @param address - the address */ public static void setAddress(EndpointReferenceType ref, String address) { - WSAEndpointReferenceUtils.setAddress(ref, address); + AttributedURIType a = new AttributedURIType(); + a.setValue(address); + ref.setAddress(a); } /** * Create an endpoint reference for the provided wsdl, service and portname. @@ -860,8 +711,8 @@ public final class EndpointReferenceUtil public static EndpointReferenceType getEndpointReference(URL wsdlUrl, QName serviceName, String portName) { - EndpointReferenceType reference = - WSAEndpointReferenceUtils.createEndpointReferenceWithMetadata(); + EndpointReferenceType reference = new EndpointReferenceType(); + reference.setMetadata(new MetadataType()); setServiceAndPortName(reference, serviceName, portName); //TODO To Ensure it is a valid URI syntax. setWSDLLocation(reference, wsdlUrl.toString()); @@ -876,8 +727,11 @@ public final class EndpointReferenceUtil * @return EndpointReferenceType - the duplicate endpoint reference */ public static EndpointReferenceType duplicate(EndpointReferenceType ref) { - - return WSAEndpointReferenceUtils.duplicate(ref); + EndpointReferenceType reference = new EndpointReferenceType(); + reference.setMetadata(ref.getMetadata()); + reference.getAny().addAll(ref.getAny()); + reference.setAddress(ref.getAddress()); + return reference; } /** @@ -886,13 +740,15 @@ public final class EndpointReferenceUtil * @return EndpointReferenceType - the endpoint reference */ public static EndpointReferenceType getEndpointReference(String address) { - - return WSAEndpointReferenceUtils.getEndpointReference(address); + EndpointReferenceType reference = new EndpointReferenceType(); + setAddress(reference, address); + return reference; } public static EndpointReferenceType getEndpointReference(AttributedURIType address) { - - return WSAEndpointReferenceUtils.getEndpointReference(address); + EndpointReferenceType reference = new EndpointReferenceType(); + reference.setAddress(address); + return reference; } /** @@ -900,8 +756,9 @@ public final class EndpointReferenceUtil * @return EndpointReferenceType - the endpoint reference */ public static EndpointReferenceType getAnonymousEndpointReference() { - - return WSAEndpointReferenceUtils.getAnonymousEndpointReference(); + EndpointReferenceType reference = new EndpointReferenceType(); + setAddress(reference, ANONYMOUS_ADDRESS); + return reference; } /** Copied: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointUtilsException.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java?p2=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointUtilsException.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/EndpointUtilsException.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java Thu May 30 18:56:16 2013 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.wsdl; +package org.apache.cxf.ws.addressing; import org.apache.cxf.common.i18n.Exception; import org.apache.cxf.common.i18n.Message; Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java Thu May 30 18:56:16 2013 @@ -42,7 +42,6 @@ import org.apache.cxf.ws.addressing.v200 import org.apache.cxf.ws.addressing.v200408.ObjectFactory; import org.apache.cxf.ws.addressing.v200408.Relationship; import org.apache.cxf.ws.addressing.v200408.ServiceNameType; -import org.apache.cxf.wsdl.EndpointReferenceUtils; /** * This class is responsible for transforming between the native Modified: cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb (original) +++ cxf/branches/dkulp-nowsdl4j/api/src/main/resources/schemas/wsdl/http.xjb Thu May 30 18:56:16 2013 @@ -28,9 +28,9 @@ - + Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java?rev=1487975&r1=1487974&r2=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java (original) +++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java Thu May 30 18:56:16 2013 @@ -24,7 +24,7 @@ import java.util.logging.Logger; import javax.xml.namespace.QName; import org.apache.cxf.Bus; -import org.apache.cxf.binding.AbstractBaseBindingFactory; +import org.apache.cxf.binding.AbstractBindingFactory; import org.apache.cxf.binding.Binding; import org.apache.cxf.binding.xml.XMLBinding; import org.apache.cxf.binding.xml.interceptor.XMLFaultOutInterceptor; @@ -45,7 +45,7 @@ import org.apache.cxf.transport.Destinat * CXF JAX-RS interceptors with the runtime. */ @NoJSR250Annotations(unlessNull = { "bus" }) -public class JAXRSBindingFactory extends AbstractBaseBindingFactory { +public class JAXRSBindingFactory extends AbstractBindingFactory { public static final String JAXRS_BINDING_ID = "http://apache.org/cxf/binding/jaxrs"; private static final Logger LOG = LogUtils.getL7dLogger(JAXRSBindingFactory.class); Added: cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml?rev=1487975&view=auto ============================================================================== --- cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml (added) +++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml Thu May 30 18:56:16 2013 @@ -0,0 +1,44 @@ + + + 4.0.0 + org.apache.cxf + cxf-rt-wsdl + jar + 3.0.0-SNAPSHOT + Apache CXF Runtime Core for WSDL + Apache CXF Runtime Core for WSDL Based Technologies + http://cxf.apache.org + + + org.apache.cxf + cxf-parent + 3.0.0-SNAPSHOT + ../../parent/pom.xml + + + + + org.apache.cxf + cxf-api + ${project.version} + + + + Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/AbstractCXFTest.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/AbstractCXFTest.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/AbstractCXFTest.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/TestApplicationContext.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/TestApplicationContext.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/TestApplicationContext.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/TestUtilities.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/TestUtilities.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/TestUtilities.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/XPathAssert.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/XPathAssert.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/test/XPathAssert.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/wsdl/UsingAddressing.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/wsdl/UsingAddressing.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/wsdl/UsingAddressing.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/wsdl/UsingAddressing.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/wsdl/UsingAddressing.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/wsdl/jaxb.index (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/wsdl/jaxb.index) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/wsdl/jaxb.index?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/ws/addressing/wsdl/jaxb.index&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/ws/addressing/wsdl/jaxb.index&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/Messages.properties (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/Messages.properties) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/Messages.properties?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/Messages.properties&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/Messages.properties&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSAEndpointReferenceUtils.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSAEndpointReferenceUtils.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSAEndpointReferenceUtils.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSAEndpointReferenceUtils.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSAEndpointReferenceUtils.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLBuilder.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLBuilder.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLBuilder.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLBuilder.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLBuilder.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensionLoader.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLExtensionLoader.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensionLoader.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensionLoader.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLExtensionLoader.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/helpers/WSDLHelper.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/helpers/WSDLHelper.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/helpers/WSDLHelper.java (original) +++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java Thu May 30 18:56:16 2013 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.helpers; +package org.apache.cxf.wsdl; import java.io.File; import java.util.ArrayList; @@ -37,6 +37,8 @@ import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; +import org.apache.cxf.helpers.CastUtils; + public class WSDLHelper { public BindingOperation getBindingOperation(Definition def, String operationName) { Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLLibrary.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLLibrary.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLLibrary.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLLibrary.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLLibrary.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java (original) +++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java Thu May 30 18:56:16 2013 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.binding; +package org.apache.cxf.wsdl.binding; import java.util.Collection; @@ -31,6 +31,7 @@ import javax.wsdl.extensions.Extensibili import javax.xml.namespace.QName; import org.apache.cxf.Bus; +import org.apache.cxf.binding.AbstractBindingFactory; import org.apache.cxf.service.model.AbstractPropertiesHolder; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.BindingOperationInfo; @@ -38,7 +39,7 @@ import org.apache.cxf.service.model.Serv import static org.apache.cxf.helpers.CastUtils.cast; -public abstract class AbstractBindingFactory extends AbstractBaseBindingFactory +public abstract class AbstractBindingFactory extends AbstractBindingFactory implements WSDLBindingFactory { public AbstractBindingFactory() { Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/WSDLBindingFactory.java (from r1487971, cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/WSDLBindingFactory.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/WSDLBindingFactory.java&p1=cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java (original) +++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/WSDLBindingFactory.java Thu May 30 18:56:16 2013 @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.cxf.binding; +package org.apache.cxf.wsdl.binding; import javax.wsdl.Binding; +import org.apache.cxf.binding.BindingFactory; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.ServiceInfo; Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/Messages.properties (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/Messages.properties?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/Messages.properties&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/Messages.properties&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty) Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java (from r1487971, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java) URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java&r1=1487971&r2=1487975&rev=1487975&view=diff ============================================================================== (empty)