Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 42248 invoked from network); 4 Sep 2006 07:29:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Sep 2006 07:29:29 -0000 Received: (qmail 21941 invoked by uid 500); 4 Sep 2006 07:29:28 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 21850 invoked by uid 500); 4 Sep 2006 07:29:28 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 21841 invoked by uid 99); 4 Sep 2006 07:29:28 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Sep 2006 00:29:28 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Sep 2006 00:29:27 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1AE661A981A; Mon, 4 Sep 2006 00:29:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439965 - in /incubator/cxf/trunk: api/src/test/java/org/apache/cxf/wsdl/ api/src/test/resources/wsdl/ rt/core/src/main/java/org/apache/cxf/wsdl11/ rt/core/src/main/resources/META-INF/ Date: Mon, 04 Sep 2006 07:29:06 -0000 To: cxf-commits@incubator.apache.org From: tli@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060904072907.1AE661A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: tli Date: Mon Sep 4 00:29:06 2006 New Revision: 439965 URL: http://svn.apache.org/viewvc?view=rev&rev=439965 Log: remove objectweb.org namespace, fix mapping bug in wsdl extension Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java incubator/cxf/trunk/api/src/test/resources/wsdl/hello_world_xml_bare.wsdl incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java incubator/cxf/trunk/rt/core/src/main/resources/META-INF/extensions.xml Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java?view=diff&rev=439965&r1=439964&r2=439965 ============================================================================== --- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java (original) +++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java Mon Sep 4 00:29:06 2006 @@ -77,7 +77,7 @@ wsdlDefinition = wsdlReader.readWSDL(file); - Binding b = wsdlDefinition.getBinding(new QName("http://objectweb.org/hello_world_xml_http/bare", + Binding b = wsdlDefinition.getBinding(new QName("http://apache.org/hello_world_xml_http/bare", "Greeter_XMLBinding")); BindingOperation bo = b.getBindingOperation("sayHi", null, null); BindingInput bi = bo.getBindingInput(); Modified: incubator/cxf/trunk/api/src/test/resources/wsdl/hello_world_xml_bare.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/resources/wsdl/hello_world_xml_bare.wsdl?view=diff&rev=439965&r1=439964&r2=439965 ============================================================================== --- incubator/cxf/trunk/api/src/test/resources/wsdl/hello_world_xml_bare.wsdl (original) +++ incubator/cxf/trunk/api/src/test/resources/wsdl/hello_world_xml_bare.wsdl Mon Sep 4 00:29:06 2006 @@ -1,15 +1,34 @@ - + + - Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?view=diff&rev=439965&r1=439964&r2=439965 ============================================================================== --- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original) +++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Mon Sep 4 00:29:06 2006 @@ -19,12 +19,12 @@ package org.apache.cxf.wsdl11; - import java.io.File; import java.io.IOException; import java.net.URL; import java.util.Iterator; import java.util.Properties; +import java.util.StringTokenizer; import java.util.WeakHashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -52,8 +52,8 @@ */ public class WSDLManagerImpl implements WSDLManager { - private static final Logger LOG = LogUtils - .getL7dLogger(WSDLManagerImpl.class); + private static final Logger LOG = LogUtils.getL7dLogger(WSDLManagerImpl.class); + private static final String EXTENSIONS_RESOURCE = "META-INF/extensions.xml"; final ExtensionRegistry registry; @@ -61,7 +61,7 @@ final WSDLFactory factory; final WeakHashMap definitionsMap; - + public WSDLManagerImpl() throws BusException { try { factory = WSDLFactory.newInstance(); @@ -70,7 +70,7 @@ throw new BusException(e); } definitionsMap = new WeakHashMap(); - + registerInitialExtensions(); } @@ -82,7 +82,7 @@ * (non-Javadoc) * * XXX - getExtensionRegistry() - * + * * @see org.apache.cxf.wsdl.WSDLManager#getExtenstionRegistry() */ public ExtensionRegistry getExtenstionRegistry() { @@ -138,11 +138,11 @@ } public Definition getDefinition(Class sei) throws WSDLException { - + if (null == sei.getAnnotation(WebService.class)) { return null; } - + synchronized (definitionsMap) { if (definitionsMap.containsKey(sei)) { return definitionsMap.get(sei); @@ -151,22 +151,22 @@ Definition def = null; try { def = createDefinition(sei); - } catch (Exception ex) { + } catch (Exception ex) { throw new WSDLException(WSDLException.PARSER_ERROR, ex.getMessage()); } - + synchronized (definitionsMap) { definitionsMap.put(sei, def); } return def; } - + public void addDefinition(Object key, Definition wsdl) { synchronized (definitionsMap) { definitionsMap.put(key, wsdl); } } - + private Definition loadDefinition(String url) throws WSDLException { WSDLReader reader = factory.newWSDLReader(); reader.setFeature("javax.wsdl.verbose", false); @@ -203,7 +203,7 @@ try { int result = 0; org.apache.cxf.tools.java2wsdl.JavaToWSDL.runTool(new String[] {"-o", - tmp.getPath() + "/tmp.wsdl", sei.getName() }); + tmp.getPath() + "/tmp.wsdl", sei.getName() }); if (0 != result) { LOG.log(Level.SEVERE, "WSDL_GENERATION_BAD_RESULT_MSG", result); return null; @@ -230,8 +230,7 @@ LOG.severe("WSDL_SCHEMA_GENERATION_FAILURE_MSG"); return null; } else if (LOG.isLoggable(Level.INFO)) { - LOG.info("Generated " + wsdl.getPath() + " and " - + schema.getPath()); + LOG.info("Generated " + wsdl.getPath() + " and " + schema.getPath()); } /* @@ -244,8 +243,8 @@ * LOG.log(Level.SEVERE, "WSDL_UNREADABLE_MSG", ex); } */ - // definition = org.apache.cxf.tools.java2wsdl.JavaToWSDL.getDefinition(); - + // definition = + // org.apache.cxf.tools.java2wsdl.JavaToWSDL.getDefinition(); } finally { class Directory { private final File dir; @@ -272,26 +271,23 @@ return definition; } - + private void registerInitialExtensions() throws BusException { Properties initialExtensions = null; try { - initialExtensions = PropertiesLoaderUtils - .loadAllProperties(EXTENSIONS_RESOURCE, Thread.currentThread() - .getContextClassLoader()); + initialExtensions = PropertiesLoaderUtils.loadAllProperties(EXTENSIONS_RESOURCE, Thread + .currentThread().getContextClassLoader()); } catch (IOException ex) { throw new BusException(ex); } - + for (Iterator it = initialExtensions.keySet().iterator(); it.hasNext();) { - String parentType = (String)it.next(); - String elementType = initialExtensions.getProperty(parentType); - + StringTokenizer st = new StringTokenizer(initialExtensions.getProperty((String) it.next()), "="); + String parentType = st.nextToken(); + String elementType = st.nextToken(); try { - JAXBExtensionHelper.addExtensions(registry, - parentType, - elementType, - getClass().getClassLoader()); + JAXBExtensionHelper.addExtensions(registry, parentType, elementType, getClass() + .getClassLoader()); } catch (ClassNotFoundException ex) { LOG.log(Level.WARNING, "EXTENSION_ADD_FAILED_MSG", ex); } catch (JAXBException ex) { Modified: incubator/cxf/trunk/rt/core/src/main/resources/META-INF/extensions.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/resources/META-INF/extensions.xml?view=diff&rev=439965&r1=439964&r2=439965 ============================================================================== --- incubator/cxf/trunk/rt/core/src/main/resources/META-INF/extensions.xml (original) +++ incubator/cxf/trunk/rt/core/src/main/resources/META-INF/extensions.xml Mon Sep 4 00:29:06 2006 @@ -19,9 +19,9 @@ --> - org.apache.cxf.bindings.xformat.XMLBindingMessageFormat - org.apache.cxf.bindings.xformat.XMLBindingMessageFormat - org.apache.cxf.transports.jms.JMSAddressPolicyType - org.apache.cxf.transports.jms.JMSClientBehaviorPolicyType - org.apache.cxf.transports.jms.JMSServerBehaviorPolicyType + javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat + javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat + javax.wsdl.Port=org.apache.cxf.transports.jms.JMSAddressPolicyType + javax.wsdl.Port=org.apache.cxf.transports.jms.JMSClientBehaviorPolicyType + javax.wsdl.Port=org.apache.cxf.transports.jms.JMSServerBehaviorPolicyType