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 B91E110A33 for ; Fri, 31 May 2013 20:25:20 +0000 (UTC) Received: (qmail 36939 invoked by uid 500); 31 May 2013 20:25:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 36876 invoked by uid 500); 31 May 2013 20:25:20 -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 36869 invoked by uid 99); 31 May 2013 20:25:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 May 2013 20:25:20 +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; Fri, 31 May 2013 20:25:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2962A2388A2C; Fri, 31 May 2013 20:24:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1488384 - in /cxf/branches/dkulp-nowsdl4j/rt: ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/ wsdl/src/main/java/org/apache/cxf/wsdl/ wsdl/src/main/java/org/apache/cxf/wsdl11/ Date: Fri, 31 May 2013 20:24:57 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130531202457.2962A2388A2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri May 31 20:24:56 2013 New Revision: 1488384 URL: http://svn.apache.org/r1488384 Log: iForgot a file Added: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensibilityElement.java Modified: cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Modified: cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java?rev=1488384&r1=1488383&r2=1488384&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java (original) +++ cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java Fri May 31 20:24:56 2013 @@ -301,7 +301,7 @@ public class Wsdl11AttachmentPolicyProvi if (null == di) { return null; } - Definition def = (Definition)di.getProperty("org.apache.cxf.wsdl11.WSDLServiceBuilder.WSDL_DEFINITION"); + Definition def = (Definition)di.getProperty("org.apache.cxf.wsdl11.WSDLServiceBuilder.DEFINITION"); if (null == def) { return null; } Added: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensibilityElement.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensibilityElement.java?rev=1488384&view=auto ============================================================================== --- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensibilityElement.java (added) +++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensibilityElement.java Fri May 31 20:24:56 2013 @@ -0,0 +1,30 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * 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 + * + * 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 + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.wsdl; + +public class JAXBExtensibilityElement extends TExtensibilityElementImpl { + Object value; + JAXBExtensibilityElement(Object o) { + value = o; + } + + public Object getValue() { + return value; + } +} \ No newline at end of file Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1488384&r1=1488383&r2=1488384&view=diff ============================================================================== --- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original) +++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Fri May 31 20:24:56 2013 @@ -599,7 +599,6 @@ public class WSDLServiceBuilder { opInfo.setInput(input.getName(), minfo); buildMessage(minfo, input.getMessage()); copyExtensors(minfo, input.getExtensibilityElements()); - copyExtensors(minfo, input.getMessage().getExtensibilityElements()); copyExtensionAttributes(minfo, input); } Output output = op.getOutput(); @@ -611,7 +610,6 @@ public class WSDLServiceBuilder { opInfo.setOutput(output.getName(), minfo); buildMessage(minfo, output.getMessage()); copyExtensors(minfo, output.getExtensibilityElements()); - copyExtensors(minfo, output.getMessage().getExtensibilityElements()); copyExtensionAttributes(minfo, output); } Map m = op.getFaults();