Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 26374 invoked from network); 10 Dec 2007 05:32:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Dec 2007 05:32:57 -0000 Received: (qmail 50312 invoked by uid 500); 10 Dec 2007 05:32:45 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 50261 invoked by uid 500); 10 Dec 2007 05:32:45 -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 50252 invoked by uid 99); 10 Dec 2007 05:32:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2007 21:32:45 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Dec 2007 05:32:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ADF751A9832; Sun, 9 Dec 2007 21:32:35 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r602780 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/tools/common/ tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/ tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/ tools/wsdlto/frontend/javasc... Date: Mon, 10 Dec 2007 05:31:49 -0000 To: cxf-commits@incubator.apache.org From: mmao@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071210053235.ADF751A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mmao Date: Sun Dec 9 21:31:39 2007 New Revision: 602780 URL: http://svn.apache.org/viewvc?rev=602780&view=rev Log: * Cleanup the java2ws, since the java2js has it's own package Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java incubator/cxf/trunk/tools/wsdlto/frontend/javascript/ (props changed) Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=602780&r1=602779&r2=602780&view=diff ============================================================================== --- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java (original) +++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java Sun Dec 9 21:31:39 2007 @@ -63,7 +63,6 @@ public static final String CFG_XJC_ARGS = "xjc"; public static final String CFG_CATALOG = "catalog"; public static final String CFG_DEFAULT_VALUES = "defaultValues"; - public static final String CFG_JAVASCRIPT_OUTPUT = "javascriptOutput"; public static final String CFG_JAVASCRIPT_UTILS = "javascriptUtils"; Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java?rev=602780&r1=602779&r2=602780&view=diff ============================================================================== --- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java (original) +++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java Sun Dec 9 21:31:39 2007 @@ -32,7 +32,6 @@ import org.apache.cxf.tools.common.toolspec.parser.BadUsageException; import org.apache.cxf.tools.common.toolspec.parser.CommandDocument; import org.apache.cxf.tools.common.toolspec.parser.ErrorVisitor; -import org.apache.cxf.tools.java2js.processor.JavaToJSProcessor; import org.apache.cxf.tools.java2wsdl.processor.JavaToWSDLProcessor; import org.apache.cxf.tools.java2wsdl.processor.internal.jaxws.JAXWSFrontEndProcessor; import org.apache.cxf.tools.java2wsdl.processor.internal.simple.SimpleFrontEndProcessor; @@ -73,11 +72,7 @@ env.put(ToolConstants.CFG_DATABINDING, ToolConstants.AEGIS_DATABINDING); } env.put(ToolConstants.CFG_FRONTEND, ft); - if (null != env.get(ToolConstants.CFG_JAVASCRIPT_OUTPUT)) { - processJavascript(env); - } else { - processWSDL(env, ft); - } + processWSDL(env, ft); } } catch (ToolException ex) { if (ex.getCause() instanceof BadUsageException) { @@ -98,12 +93,6 @@ } finally { tearDown(); } - } - - private void processJavascript(ToolContext env) { - Processor processor = new JavaToJSProcessor(); - processor.setEnvironment(env); - processor.process(); } private void processWSDL(ToolContext env, String ft) { Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml?rev=602780&r1=602779&r2=602780&view=diff ============================================================================== --- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml (original) +++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml Sun Dec 9 21:31:39 2007 @@ -32,7 +32,6 @@ java2ws -o hello.wsdl -wsdl org.apache.hello_world_soap_http.Greeter java2ws -client -server org.apache.hello_world_soap_http.Greeter java2ws -wrapperbean org.apache.hello_world_soap_http.Greeter - java2ws -javascript org.apache.hello_world_soap_http.Greeter -o bloop.js @@ -57,20 +56,6 @@ - - - -