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 39A586C01 for ; Wed, 6 Jul 2011 07:03:57 +0000 (UTC) Received: (qmail 98524 invoked by uid 500); 6 Jul 2011 07:03:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98410 invoked by uid 500); 6 Jul 2011 07:03:48 -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 98400 invoked by uid 99); 6 Jul 2011 07:03:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jul 2011 07:03:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Wed, 06 Jul 2011 07:03:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9C1F523889BB for ; Wed, 6 Jul 2011 07:03:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1143270 - in /cxf/trunk: api/src/main/java/org/apache/cxf/tools/common/ distribution/src/main/assembly/ rt/core/src/main/java/org/apache/cxf/wsdl11/ tools/common/src/test/resources/schemas/wsdl/ Date: Wed, 06 Jul 2011 07:03:19 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110706070319.9C1F523889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Wed Jul 6 07:03:19 2011 New Revision: 1143270 URL: http://svn.apache.org/viewvc?rev=1143270&view=rev Log: [CXF-3599]some cleanup Modified: cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java cxf/trunk/distribution/src/main/assembly/bin.xml cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd Modified: cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=1143270&r1=1143269&r2=1143270&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java Wed Jul 6 07:03:19 2011 @@ -182,11 +182,6 @@ public final class ToolConstants { public static final String NS_JMS_ADDRESS = "http://cxf.apache.org/transports/jms"; public static final QName JMS_ADDRESS = new QName(NS_JMS_ADDRESS, "address"); - // JBI address - public static final String NS_JBI_ADDRESS = "http://cxf.apache.org/transports/jbi"; - public static final QName JBI_ADDRESS = new QName(NS_JBI_ADDRESS, "address"); - - public static final String JMS_ADDR_DEST_STYLE = "destinationStyle"; public static final String JMS_ADDR_JNDI_URL = "jndiProviderURL"; public static final String JMS_ADDR_JNDI_FAC = "jndiConnectionFactoryName"; Modified: cxf/trunk/distribution/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/assembly/bin.xml?rev=1143270&r1=1143269&r2=1143270&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/assembly/bin.xml (original) +++ cxf/trunk/distribution/src/main/assembly/bin.xml Wed Jul 6 07:03:19 2011 @@ -78,7 +78,6 @@ **/target **/build/**/* **/target/**/* - integration/JBI/**/build.properties Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1143270&r1=1143269&r2=1143270&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Wed Jul 6 07:03:19 2011 @@ -430,10 +430,6 @@ public class WSDLServiceBuilder { break; // TODO: this is really ugly, but how to link between // this binding and this transport ? - } else if ("http://cxf.apache.org/bindings/jbi".equals(el.getElementType() - .getNamespaceURI())) { - ns = "http://cxf.apache.org/transports/jbi"; - break; } } } Modified: cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd?rev=1143270&r1=1143269&r2=1143270&view=diff ============================================================================== --- cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd (original) +++ cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd Wed Jul 6 07:03:19 2011 @@ -17,23 +17,25 @@ specific language governing permissions and limitations under the License. --> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +