Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 51769 invoked from network); 2 Jun 2008 02:22:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jun 2008 02:22:40 -0000 Received: (qmail 88084 invoked by uid 500); 2 Jun 2008 02:22:42 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 88029 invoked by uid 500); 2 Jun 2008 02:22:42 -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 88020 invoked by uid 99); 2 Jun 2008 02:22:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jun 2008 19:22:42 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 02 Jun 2008 02:21:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 265F02388A26; Sun, 1 Jun 2008 19:22:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r662308 - in /cxf/trunk: rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/ tools/wsdlto/frontend/javascript/src/main/resources/org/ tools/wsdlto/fro... Date: Mon, 02 Jun 2008 02:22:15 -0000 To: commits@cxf.apache.org From: bimargulies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080602022216.265F02388A26@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bimargulies Date: Sun Jun 1 19:22:15 2008 New Revision: 662308 URL: http://svn.apache.org/viewvc?rev=662308&view=rev Log: Fix two issues with wsdl2js. Fix -p, remove -client. Added: cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml - copied, changed from r662305, cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml Removed: cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java cxf/trunk/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=662308&r1=662307&r2=662308&view=diff ============================================================================== --- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java (original) +++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Sun Jun 1 19:22:15 2008 @@ -82,7 +82,7 @@ } if (inf != null && inf.getMessagePart(0).getTypeClass() != null) { - //if the wrapper has a type class, we don't need t do anything + //if the wrapper has a type class, we don't need to do anything //as everything would have been discovered when walking the //wrapper type (unless it's a header which wouldn't be in the wrapper) return; Modified: cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=662308&r1=662307&r2=662308&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java (original) +++ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java Sun Jun 1 19:22:15 2008 @@ -83,7 +83,7 @@ public void execute() throws ToolException { buildToolContext(); validate(context); - + WSDLConstants.WSDLVersion version = getWSDLVersion(); String wsdlURL = (String)context.get(ToolConstants.CFG_WSDLURL); Modified: cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java?rev=662308&r1=662307&r2=662308&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java (original) +++ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java Sun Jun 1 19:22:15 2008 @@ -28,8 +28,10 @@ import java.io.OutputStreamWriter; import java.nio.charset.Charset; import java.util.Collection; +import java.util.Map; import org.apache.cxf.common.i18n.Message; +import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.javascript.BasicNameManager; import org.apache.cxf.javascript.JavascriptQueryHandler; import org.apache.cxf.javascript.NamespacePrefixAccumulator; @@ -48,12 +50,23 @@ super.process(); ServiceInfo serviceInfo = context.get(ServiceInfo.class); - File jsFile = getOutputFile(serviceInfo.getName().getLocalPart() + ".js"); BasicNameManager nameManager = BasicNameManager.newNameManager(serviceInfo, null); NamespacePrefixAccumulator prefixManager = new NamespacePrefixAccumulator(serviceInfo - .getXmlSchemaCollection()); + .getXmlSchemaCollection()); + + Map nsPrefixMap = + CastUtils.cast( + context.get(ToolConstants.CFG_JSPREFIXMAP, Map.class), + String.class, String.class); + + if (nsPrefixMap != null) { + for (Map.Entry prefixEntry : nsPrefixMap.entrySet()) { + prefixManager.collect(prefixEntry.getValue(), prefixEntry.getKey()); + } + } + Collection schemata = serviceInfo.getSchemas(); try { FileOutputStream fileOutputStream = new FileOutputStream(jsFile); Copied: cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml (from r662305, cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml?p2=cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml&p1=cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml&r1=662305&r2=662308&rev=662308&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml (original) +++ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/resources/org/apache/cxf/tools/wsdlto/javascript/javascript-toolspec.xml Sun Jun 1 19:22:15 2008 @@ -25,7 +25,7 @@ Examples: - wsdl2java -client HelloWorld.wsdl + wsdl2js HelloWorld.wsdl @@ -72,12 +72,6 @@ - -