cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
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 GMT
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
 	</annotation>
 	<usage>
 		<optionGroup id="options">
@@ -57,20 +56,6 @@
 				</associatedArgument>
 			</option>
 			
-			<option id="javascriptOutput" maxOccurs="1">
-				<annotation>
-					Request output of a JavaScript client.
-				</annotation>
-				<switch>js</switch>
-			</option>
-			
-			<option id="javascriptUtils" maxOccurs="1">
-				<annotation>
-					Write the JavaScript common utilities at the beginning of the output.
-				</annotation>
-				<switch>jsutils</switch>
-			</option>
-
 			<option id="wsdl" maxOccurs="1">
 				<annotation>
 					Specify to generate the WSDL file

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java?rev=602780&r1=602779&r2=602780&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java
Sun Dec  9 21:31:39 2007
@@ -24,7 +24,7 @@
 import org.apache.cxf.tools.common.ProcessorTestBase;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
-import org.apache.cxf.tools.java2ws.JavaToWS;
+import org.apache.cxf.tools.java2js.JavaToJS;
 import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
 import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
 import org.apache.cxf.tools.wsdlto.core.PluginLoader;
@@ -40,7 +40,6 @@
     @Before
     public void startUp() throws Exception {
         env = new ToolContext();
-        env.put(ToolConstants.CFG_JAVASCRIPT_OUTPUT, ToolConstants.CFG_JAVASCRIPT_OUTPUT);

         classPath = System.getProperty("java.class.path");
         System.setProperty("java.class.path", getClassPath());
     }
@@ -89,15 +88,13 @@
         //      test flag
         String[] args = new String[] {"-o",
                                       "java2wsdl.js",
-                                      "-js",
                                       "-jsutils",
                                       "-cp",
                                       classFile.getCanonicalPath(),
                                       "-d",
                                       output.getPath(),
-                                      "-wsdl",
                                       "org.apache.cxf.classpath.Greeter"};
-        JavaToWS.main(args);
+        JavaToJS.main(args);
         File jsFile = new File(output, "java2wsdl.js");
         assertTrue("Generate JS Fail", jsFile.exists());
     }

Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/javascript/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Dec  9 21:31:39 2007
@@ -0,0 +1 @@
+target



Mime
View raw message