Author: ema
Date: Mon Sep 17 20:09:02 2007
New Revision: 576673
URL: http://svn.apache.org/viewvc?rev=576673&view=rev
Log:
Added Java2WS ant task
Added:
incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSTask.java
Modified:
incubator/cxf/trunk/tools/anttask/pom.xml
incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml
Modified: incubator/cxf/trunk/tools/anttask/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/anttask/pom.xml?rev=576673&r1=576672&r2=576673&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/anttask/pom.xml (original)
+++ incubator/cxf/trunk/tools/anttask/pom.xml Mon Sep 17 20:09:02 2007
@@ -43,6 +43,14 @@
<artifactId>cxf-tools-java2wsdl</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-tools-java2ws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
Added:
incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSTask.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSTask.java?rev=576673&view=auto
==============================================================================
---
incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSTask.java
(added)
+++
incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSTask.java
Mon Sep 17 20:09:02 2007
@@ -0,0 +1,198 @@
+/**
+ * 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.ant.extensions;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.tools.java2ws.JavaToWS;
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
+
+public class Java2WSTask extends CxfAntTask {
+ private Path classpath;
+
+ private File wsdlDir;
+ private String protocol;
+ private String className;
+ private boolean genWsdl;
+ private boolean genWrapperbean;
+ private boolean genServer;
+ private boolean genClient;
+ private String frontend;
+ private String databinding;
+
+ public void setGenwsdl(boolean gw) {
+ genWsdl = gw;
+ }
+
+ public void setGenWrapperBean(boolean gwp) {
+ genWrapperbean = gwp;
+ }
+
+ public void setGenClient(boolean gc) {
+ genClient = gc;
+ }
+
+ public void setGenServer(boolean gs) {
+ genServer = gs;
+ }
+
+ public void setFrontend(String ft) {
+ frontend = ft;
+ }
+
+ public void setDatabinding(String db) {
+ databinding = db;
+ }
+
+ public Path createClasspath() {
+ if (classpath == null) {
+ classpath = new Path(getProject());
+ }
+ return classpath.createPath();
+ }
+ public void setClasspath(Path c) {
+ if (classpath == null) {
+ classpath = c;
+ } else {
+ classpath.append(c);
+ }
+ }
+ public void setClasspathRef(Reference r) {
+ createClasspath().setRefid(r);
+ }
+
+
+ public void setProtocol(String p) {
+ protocol = p;
+ }
+
+ public void setResourcedestdir(File f) {
+ wsdlDir = f;
+ }
+
+ public void setSei(String clz) {
+ className = clz;
+ }
+
+ public void execute() throws BuildException {
+ buildCommandLine();
+
+ LogStreamHandler log = new LogStreamHandler(this, Project.MSG_INFO,
Project.MSG_WARN);
+ Execute exe = new Execute(log);
+ exe.setAntRun(getProject());
+ exe.setCommandline(cmd.getCommandline());
+ try {
+ int rc = exe.execute();
+ if (exe.killedProcess()
+ || rc != 0) {
+ throw new BuildException("java2ws failed", getLocation());
+ }
+ } catch (IOException e) {
+ throw new BuildException(e, getLocation());
+ }
+ }
+
+ public void buildCommandLine() {
+ ClassLoader loader = this.getClass().getClassLoader();
+ Path runCp = new Path(getProject());
+ if (loader instanceof AntClassLoader) {
+ runCp = new Path(getProject(),
((AntClassLoader)loader).getClasspath());
+ }
+ cmd.createClasspath(getProject()).append(runCp);
+ cmd.createVmArgument().setLine("-Djava.util.logging.config.file=");
+
+ cmd.setClassname(JavaToWS.class.getName());
+
+ if (!StringUtils.isEmpty(frontend)) {
+ cmd.createArgument().setValue("-frontend");
+ cmd.createArgument().setValue(frontend);
+ }
+
+
+ if (!StringUtils.isEmpty(databinding)) {
+ cmd.createArgument().setValue("-databinding");
+ cmd.createArgument().setValue(databinding);
+ }
+
+ if (genWsdl) {
+ cmd.createArgument().setValue("-wsdl");
+ }
+
+ if (genWrapperbean) {
+ cmd.createArgument().setValue("-wrapperbean");
+ }
+
+ if (genClient) {
+ cmd.createArgument().setValue("-client");
+ }
+
+ if (genServer) {
+ cmd.createArgument().setValue("-server");
+ }
+
+ if (classpath != null && !classpath.toString().equals("")) {
+ cmd.createArgument().setValue("-cp");
+ cmd.createArgument().setPath(classpath);
+ }
+
+
+ if (null != classesDir
+ && !StringUtils.isEmpty(classesDir.getName())) {
+ cmd.createArgument().setValue("-classdir");
+ cmd.createArgument().setFile(classesDir);
+ }
+ if (null != sourcesDir
+ && !StringUtils.isEmpty(sourcesDir.getName())) {
+ cmd.createArgument().setValue("-s");
+ cmd.createArgument().setFile(sourcesDir);
+ }
+
+ // verbose option
+ if (verbose) {
+ cmd.createArgument().setValue("-verbose");
+ }
+
+ if ("Xsoap1.2".equals(protocol)) {
+ cmd.createArgument().setValue("-soap12");
+ }
+
+ cmd.createArgument().setValue("-createxsdimports");
+
+ if (null != wsdlDir
+ && !StringUtils.isEmpty(wsdlDir.getName())) {
+ cmd.createArgument().setValue("-d");
+ cmd.createArgument().setFile(wsdlDir);
+ }
+
+
+ if (!StringUtils.isEmpty(className)) {
+ cmd.createArgument().setValue(className);
+ }
+ }
+
+}
Modified:
incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml?rev=576673&r1=576672&r2=576673&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml
(original)
+++
incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml
Mon Sep 17 20:09:02 2007
@@ -23,4 +23,6 @@
classname="org.apache.cxf.ant.extensions.WSDL2JavaTask"/>
<taskdef name="java2wsdl"
classname="org.apache.cxf.ant.extensions.Java2WSDLTask"/>
+ <taskdef name="java2wsd"
+ classname="org.apache.cxf.ant.extensions.Java2WSTask"/>
</antlib>
