cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Kulp <dk...@apache.org>
Subject Re: svn commit: r578749 - in /incubator/cxf/trunk: ./ maven-plugins/java2ws-plugin/ maven-plugins/java2ws-plugin/main/ maven-plugins/java2ws-plugin/main/java/ maven-plugins/java2ws-plugin/main/java/org/ maven-plugins/java2ws-plugin/main/java/org/apache/ ma...
Date Mon, 24 Sep 2007 14:21:56 GMT

> [CXF-1040]Merged -s and -d flag for java2ws
> Added java2ws maven plugin

I think I have to -1 this.....

For the TCK to pass, I need three output locations:

1) location for compiled .class files
2) location for source .java files
3) location for wsdl and schema files  (and possibly other things like 
cxf.xml files, etc...)   

#2 and #3 HAVE to be different directories.  


Dan


On Monday 24 September 2007, ema@apache.org wrote:
> Author: ema
> Date: Mon Sep 24 03:31:25 2007
> New Revision: 578749
>
> URL: http://svn.apache.org/viewvc?rev=578749&view=rev
> Log:
> [CXF-1040]Merged -s and -d flag for java2ws
> Added java2ws maven plugin
>
> Added:
>     incubator/cxf/trunk/maven-plugins/java2ws-plugin/
>     incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/
>     incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/java/
>     incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/java/org/
>    
> incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/java/org/apache/
> incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/java/org/apache/
>cxf/
> incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/java/org/apache/
>cxf/maven_plugin/
> incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/java/org/apache/
>cxf/maven_plugin/Java2WSMojo.java
> incubator/cxf/trunk/maven-plugins/java2ws-plugin/pom.xml
> Modified:
>     incubator/cxf/trunk/pom.xml
>    
> incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/ext
>ensions/Java2WSTask.java
> incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools
>/java2ws/java2ws.xml
> incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools
>/java2wsdl/processor/JavaToWSDLProcessor.java
> incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools
>/java2wsdl/processor/JavaToProcessorTest.java
>
> Added:
> incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/java/org/apache/
>cxf/maven_plugin/Java2WSMojo.java URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/maven-plugins/java2ws
>-plugin/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java?rev=5787
>49&view=auto
> ======================================================================
>======== ---
> incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/java/org/apache/
>cxf/maven_plugin/Java2WSMojo.java (added) +++
> incubator/cxf/trunk/maven-plugins/java2ws-plugin/main/java/org/apache/
>cxf/maven_plugin/Java2WSMojo.java Mon Sep 24 03:31:25 2007 @@ -0,0
> +1,265 @@
> +/**
> + * 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.maven_plugin;
> +
> +import java.io.File;
> +import java.util.ArrayList;
> +import java.util.List;
> +import java.util.StringTokenizer;
> +
> +import org.apache.cxf.helpers.FileUtils;
> +import org.apache.cxf.tools.java2ws.JavaToWS;
> +import org.apache.maven.plugin.AbstractMojo;
> +import org.apache.maven.plugin.MojoExecutionException;
> +import org.apache.maven.project.MavenProject;
> +import org.apache.tools.ant.ExitException;
> +import org.apache.tools.ant.util.optional.NoExitSecurityManager;
> +
> +/**
> + * @goal java2ws
> + * @description CXF Java To Webservice Tool
> + */
> +public class Java2WSMojo extends AbstractMojo {
> +    /**
> +     * @parameter
> +     * @required
> +     */
> +    private String className;
> +
> +    /**
> +     * @parameter  expression="${project.build.outputDirectory}"
> +     * @required
> +     */
> +    private String classpath;
> +
> +    /**
> +     * @parameter
> +     */
> +    private String outputFile;
> +
> +    /**
> +     * @parameter
> +     */
> +    private Boolean soap12;
> +
> +    /**
> +     * @parameter
> +     */
> +    private String targetNamespace;
> +
> +    /**
> +     * @parameter
> +     */
> +    private String serviceName;
> +
> +    /**
> +     * @parameter
> +     */
> +    private Boolean verbose;
> +
> +    /**
> +     * @parameter
> +     */
> +    private Boolean quiet;
> +
> +    /**
> +     * @parameter  expression="${project.compileClasspathElements}"
> +     * @required
> +     */
> +    private List classpathElements;
> +
> +    /**
> +     * @parameter expression="${project}"
> +     * @required
> +     */
> +    private MavenProject project;
> +
> +    /**
> +     * @parameter
> +     */
> +    private String argline;
> +
> +    /**
> +     * @parameter
> +     */
> +    private String frontend;
> +
> +    /**
> +     * @parameter
> +     */
> +    private String databinding;
> +    /**
> +     * @parameter default-value="false"
> +     */
> +    private Boolean genWsdl;
> +    /**
> +     * @parameter default-value="false"
> +     */
> +    private Boolean genServer;
> +    /**
> +     * @parameter default-value="false"
> +     */
> +    private Boolean genClient;
> +    /**
> +     * @parameter default-value="false"
> +     */
> +    private Boolean genWrapperbean;
> +
> +
> +    public void execute() throws MojoExecutionException {
> +        StringBuffer buf = new StringBuffer();
> +        for (Object classpathElement : classpathElements) {
> +            buf.append(classpathElement.toString());
> +            buf.append(File.pathSeparatorChar);
> +        }
> +        String newCp = buf.toString();
> +        String cp = System.getProperty("java.class.path");
> +        SecurityManager oldSm = System.getSecurityManager();
> +        try {
> +            System.setProperty("java.class.path", newCp);
> +            System.setSecurityManager(new NoExitSecurityManager());
> +            processJavaClass();
> +        } finally {
> +            System.setSecurityManager(oldSm);
> +            System.setProperty("java.class.path", cp);
> +        }
> +
> +        System.gc();
> +    }
> +
> +    private void processJavaClass() throws MojoExecutionException {
> +        List<String> args = new ArrayList<String>();
> +
> +        // outputfile arg
> +        if (outputFile == null && project != null) {
> +            // Put the wsdl in target/generated/wsdl
> +            int i = className.lastIndexOf('.');
> +            // Prone to OoBE, but then it's wrong anyway
> +            String name = className.substring(i + 1);
> +            outputFile = (project.getBuild().getDirectory() +
> "/generated/wsdl/" + name + ".wsdl") +                .replace("/",
> File.separator);
> +        }
> +        if (outputFile != null) {
> +            // JavaToWSDL freaks out if the directory of the
> outputfile doesn't exist, so lets +            // create it since
> there's no easy way for the user to create it beforehand in maven +   
>         FileUtils.mkDir(new File(outputFile).getParentFile()); +      
>      args.add("-o");
> +            args.add(outputFile);
> +
> +            /*
> +              Contributor's comment:
> +              Sometimes JavaToWSDL creates Java code for the
> wrappers.  I don't *think* this is +              needed by the end
> user.
> +            */
> +
> +            // Commiter's comment:
> +            // Yes, it's required, it's defined in the JAXWS spec.
> +
> +            if (project != null) {
> +                project.addCompileSourceRoot(new
> File(outputFile).getParentFile().getAbsolutePath()); +            }
> +        }
> +
> +        if (frontend != null) {
> +            args.add("-frontend");
> +            args.add(frontend);
> +        }
> +
> +        if (databinding != null) {
> +            args.add("-databinding");
> +            args.add(databinding);
> +        }
> +
> +        if (genWrapperbean) {
> +            args.add("-wrapperbean");
> +        }
> +
> +        if (genWsdl) {
> +            args.add("-wsdl");
> +        }
> +
> +        if (genServer) {
> +            args.add("-server");
> +        }
> +
> +        if (genClient) {
> +            args.add("-client");
> +        }
> +
> +        // classpath arg
> +        args.add("-cp");
> +        args.add(classpath);
> +
> +        // soap12 arg
> +        if (soap12 != null && soap12.booleanValue()) {
> +            args.add("-soap12");
> +        }
> +
> +        // target namespace arg
> +        if (targetNamespace != null) {
> +            args.add("-t");
> +            args.add(targetNamespace);
> +        }
> +
> +        // servicename arg
> +        if (serviceName != null) {
> +            args.add("-servicename");
> +            args.add(serviceName);
> +        }
> +
> +        // verbose arg
> +        if (verbose != null && verbose.booleanValue()) {
> +            args.add("-verbose");
> +        }
> +
> +        // quiet arg
> +        if (quiet != null && quiet.booleanValue()) {
> +            args.add("-quiet");
> +        }
> +
> +        if (argline != null) {
> +            StringTokenizer stoken = new StringTokenizer(argline, "
> "); +            while (stoken.hasMoreTokens()) {
> +                args.add(stoken.nextToken());
> +            }
> +        }
> +
> +        // classname arg
> +        args.add(className);
> +
> +        try {
> +            String exitOnFinish = System.getProperty("exitOnFinish",
> ""); +            try {
> +                System.setProperty("exitOnFinish", "YES");
> +                JavaToWS.main(args.toArray(new String[args.size()]));
> +            } catch (ExitException e) {
> +                if (e.getStatus() != 0) {
> +                    throw e;
> +                }
> +            } finally {
> +                System.setProperty("exitOnFinish", exitOnFinish);
> +            }
> +        } catch (Throwable e) {
> +            getLog().debug(e);
> +            throw new MojoExecutionException(e.getMessage(), e);
> +        }
> +    }
> +
> +}
> \ No newline at end of file
>
> Added: incubator/cxf/trunk/maven-plugins/java2ws-plugin/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/maven-plugins/java2ws
>-plugin/pom.xml?rev=578749&view=auto
> ======================================================================
>======== --- incubator/cxf/trunk/maven-plugins/java2ws-plugin/pom.xml
> (added) +++ incubator/cxf/trunk/maven-plugins/java2ws-plugin/pom.xml
> Mon Sep 24 03:31:25 2007 @@ -0,0 +1,115 @@
> +<?xml version="1.0"?>
> +<!--
> +  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.
> +-->
> +<project xmlns="http://maven.apache.org/POM/4.0.0"
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
> http://maven.apache.org/maven-v4_0_0.xsd"> +   
> <modelVersion>4.0.0</modelVersion>
> +    <groupId>org.apache.cxf</groupId>
> +    <artifactId>cxf-java2ws-plugin</artifactId>
> +    <packaging>maven-plugin</packaging>
> +    <version>2.1-incubator-SNAPSHOT</version>
> +    <name>Apache CXF Code Generation Maven2 Plugins</name>
> +    <url>http://cwiki.apache.org/CXF</url>
> +
> +
> +    <parent>
> +        <groupId>org.apache.cxf</groupId>
> +        <artifactId>cxf-parent</artifactId>
> +        <version>2.1-incubator-SNAPSHOT</version>
> +        <relativePath>../../parent/pom.xml</relativePath>
> +    </parent>
> +
> +    <dependencies>
> +        <dependency>
> +            <groupId>junit</groupId>
> +            <artifactId>junit</artifactId>
> +            <scope>test</scope>
> +        </dependency>
> +
> +        <dependency>
> +            <groupId>org.apache.maven</groupId>
> +            <artifactId>maven-plugin-api</artifactId>
> +            <scope>provided</scope>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.maven</groupId>
> +            <artifactId>maven-project</artifactId>
> +            <scope>provided</scope>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.maven</groupId>
> +            <artifactId>maven-artifact</artifactId>
> +            <scope>provided</scope>
> +        </dependency>
> +
> +        <dependency>
> +            <groupId>org.apache.cxf</groupId>
> +            <artifactId>cxf-tools-common</artifactId>
> +            <version>${project.version}</version>
> +        </dependency>
> +
> +        <dependency>
> +            <groupId>org.apache.cxf</groupId>
> +            <artifactId>cxf-common-utilities</artifactId>
> +            <version>${project.version}</version>
> +        </dependency>
> +
> +        <!--dependency>
> +            <groupId>org.apache.cxf</groupId>
> +           
> <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId> +          
>  <version>${project.version}</version>
> +        </dependency>
> +
> +        <dependency>
> +            <groupId>org.apache.cxf</groupId>
> +            <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
> +            <version>${project.version}</version>
> +        </dependency-->
> +
> +        <dependency>
> +            <groupId>org.apache.cxf</groupId>
> +            <artifactId>cxf-tools-java2ws</artifactId>
> +            <version>${project.version}</version>
> +        </dependency>
> +
> +        <dependency>
> +            <groupId>ant</groupId>
> +            <artifactId>ant</artifactId>
> +        </dependency>
> +        <dependency>
> +            <groupId>ant</groupId>
> +            <artifactId>ant-nodeps</artifactId>
> +        </dependency>
> +    </dependencies>
> +
> +    <!-- will remove this after it is got sync to central repository
> --> +    <repositories>
> +        <repository>
> +            <id>java.net</id>
> +            <url>http://download.java.net/maven/1/</url>
> +            <layout>legacy</layout>
> +        </repository>
> +    </repositories>
> +
> +    <scm>
> +       
> <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trun
>k/maven-plugins/codegen-plugin</connection> +       
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubato
>r/cxf/trunk/maven-plugins/codegen-plugin</developerConnection> +     
> <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-c
>odegen-plugin</url> +  </scm>
> +
> +</project>
> \ No newline at end of file
>
> Modified: incubator/cxf/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?rev=578749&r1
>=578748&r2=578749&view=diff
> ======================================================================
>======== --- incubator/cxf/trunk/pom.xml (original)
> +++ incubator/cxf/trunk/pom.xml Mon Sep 24 03:31:25 2007
> @@ -136,8 +136,10 @@
>          <module>integration</module>
>          <module>systests</module>
>          <module>maven-plugins/codegen-plugin</module>
> +        <module>maven-plugins/java2ws-plugin</module>
>          <module>maven-plugins/archetypes</module>
>          <module>maven-plugins/eclipse-plugin-generator</module>
> +
>      </modules>
>
>      <profiles>
>
> Modified:
> incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/ext
>ensions/Java2WSTask.java URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/anttask/src/mai
>n/java/org/apache/cxf/ant/extensions/Java2WSTask.java?rev=578749&r1=578
>748&r2=578749&view=diff
> ======================================================================
>======== ---
> incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/ext
>ensions/Java2WSTask.java (original) +++
> incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/ext
>ensions/Java2WSTask.java Mon Sep 24 03:31:25 2007 @@ -48,27 +48,27 @@
>      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());
> @@ -127,34 +127,34 @@
>         
> 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);
> @@ -166,11 +166,7 @@
>              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) {
>
> 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/m
>ain/java/org/apache/cxf/tools/java2ws/java2ws.xml?rev=578749&r1=578748&
>r2=578749&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 Mon Sep 24 03:31:25 2007 @@ -26,29 +26,31 @@
>  	xmlns:ts="http://cxf.apache.org/Xutil/ToolSpecification">
>
>  	<annotation>
> - Examples :
> -   java2ws -wsdl org.apache.hello_world_soap_http.Greeter
> -   java2ws -cp ./tmp org.apache.hello_world_soap_http.Greeter -wsdl
> -   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 +		Examples :
> +		java2ws -wsdl org.apache.hello_world_soap_http.Greeter
> +		java2ws -cp ./tmp org.apache.hello_world_soap_http.Greeter -wsdl
> +		java2ws -wsdl -o hello.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 </annotation>
>  	<usage>
>  		<optionGroup id="options">
> -
> +
>  			<option id="databinding" maxOccurs="1">
>  				<annotation>
> -				    Specify the data binding (aegis or jaxb). Default is jaxb for
> jaxws -				    frontend, and aegis for simple frontend.
> +					Specify the data binding (aegis or jaxb). Default is
> +					jaxb for jaxws frontend, and aegis for simple
> +					frontend.
>  				</annotation>
>  				<switch>databinding</switch>
>  				<associatedArgument placement="afterSpace">
> -				  <annotation>jaxb or aegis</annotation>
> +					<annotation>jaxb or aegis</annotation>
>  				</associatedArgument>
>  			</option>
>  			<option id="frontend" maxOccurs="1">
>  				<annotation>
> -					Specify the frontend to use.  jaxws and the simple frontend are
> supported. +					Specify the frontend to use. jaxws and the simple
> +					frontend are supported.
>  				</annotation>
>  				<switch>frontend</switch>
>  				<associatedArgument placement="afterSpace">
> @@ -62,28 +64,28 @@
>  				</annotation>
>  				<switch>wsdl</switch>
>  			</option>
> -
> +
>  			<option id="wrapperbean" maxOccurs="1">
>  				<annotation>
>  					Specify to generate the wrapper and fault bean
>  				</annotation>
>  				<switch>wrapperbean</switch>
>  			</option>
> -
> +
>  			<option id="client" maxOccurs="1">
>  				<annotation>
>  					Specify to genearte client side code
>  				</annotation>
>  				<switch>client</switch>
>  			</option>
> -
> +
>  			<option id="server" maxOccurs="1">
>  				<annotation>
>  					Specify to genearte server side code
>  				</annotation>
>  				<switch>server</switch>
>  			</option>
> -
> +
>  			<option id="outputfile" maxOccurs="1">
>  				<annotation>
>  					Specify the output wsdl file name
> @@ -96,7 +98,8 @@
>
>  			<option id="outputdir" maxOccurs="1">
>  				<annotation>
> -					The directory in which the output files are placed
> +					The directory in which the generated source files
> +					and wsdl file are placed
>  				</annotation>
>  				<switch>d</switch>
>  				<associatedArgument placement="afterSpace">
> @@ -104,16 +107,6 @@
>  				</associatedArgument>
>  			</option>
>
> -			<option id="sourcedir" maxOccurs="1">
> -				<annotation>
> -					The directory in which the generated source files
> -					are placed
> -				</annotation>
> -				<switch>s</switch>
> -				<associatedArgument placement="afterSpace">
> -					<annotation>source-directory</annotation>
> -				</associatedArgument>
> -			</option>
>  			<option id="classdir" maxOccurs="1">
>  				<annotation>
>  					The directory in which the generated sources are
> @@ -153,13 +146,17 @@
>  					<annotation>target-namespace</annotation>
>  				</associatedArgument>
>  			</option>
> -
> +
>  			<option id="beans" maxOccurs="unbounded">
> -				<annotation>Specify the pathname of a file defining additional
> Spring beans to customize databinding -				configuration.</annotation>
> +				<annotation>
> +					Specify the pathname of a file defining additional
> +					Spring beans to customize databinding configuration.
> +				</annotation>
>  				<switch>beans</switch>
>  				<associatedArgument placement="afterSpace">
> -					<annotation>pathname of the bean definition file.</annotation>
> +					<annotation>
> +						pathname of the bean definition file.
> +					</annotation>
>  				</associatedArgument>
>  			</option>
>
> @@ -212,26 +209,20 @@
>  			</option>
>
>  			<option id="verbose">
> -				<annotation>
> -					Verbose mode
> -				</annotation>
> +				<annotation>Verbose mode</annotation>
>  				<switch>verbose</switch>
>  				<switch>V</switch>
>  			</option>
>
>  			<option id="quiet">
> -				<annotation>
> -					Quiet mode
> -				</annotation>
> +				<annotation>Quiet mode</annotation>
>  				<switch>quiet</switch>
>  				<switch>q</switch>
>  			</option>
>  		</optionGroup>
>
> -		   <argument id="classname" minOccurs="1" maxOccurs="1">
> -			   <annotation>
> -			        SEI class name
> -			   </annotation>
> -		   </argument>
> +		<argument id="classname" minOccurs="1" maxOccurs="1">
> +			<annotation>SEI class name</annotation>
> +		</argument>
>  	</usage>
>  </toolspec>
>
> Modified:
> incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools
>/java2wsdl/processor/JavaToWSDLProcessor.java URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/m
>ain/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.j
>ava?rev=578749&r1=578748&r2=578749&view=diff
> ======================================================================
>======== ---
> incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools
>/java2wsdl/processor/JavaToWSDLProcessor.java (original) +++
> incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools
>/java2wsdl/processor/JavaToWSDLProcessor.java Mon Sep 24 03:31:25 2007
> @@ -304,7 +304,7 @@
>      }
>
>      File getSourceDir() {
> -        String dir = (String)
> this.context.get(ToolConstants.CFG_SOURCEDIR); +        String dir =
> (String) this.context.get(ToolConstants.CFG_OUTPUTDIR); if
> (StringUtils.isEmpty(dir)) {
>              return null;
>          }
>
> Modified:
> incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools
>/java2wsdl/processor/JavaToProcessorTest.java URL:
> http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/t
>est/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.j
>ava?rev=578749&r1=578748&r2=578749&view=diff
> ======================================================================
>======== ---
> incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools
>/java2wsdl/processor/JavaToProcessorTest.java (original) +++
> incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools
>/java2wsdl/processor/JavaToProcessorTest.java Mon Sep 24 03:31:25 2007
> @@ -248,7 +248,7 @@
>          env.put(ToolConstants.CFG_CLASSNAME,
>                 
> "org.apache.cxf.tools.fortest.classnoanno.docwrapped.Calculator");
> env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() +
> "/my_stock.wsdl"); -        env.put(ToolConstants.CFG_SOURCEDIR,
> output.getPath() + "/beans"); +       
> env.put(ToolConstants.CFG_OUTPUTDIR, output.getPath() + "/beans");
> env.put(ToolConstants.CFG_WRAPPERBEAN, ToolConstants.CFG_WRAPPERBEAN);
>
>          processor.setEnvironment(env);



-- 
J. Daniel Kulp
Principal Engineer
IONA
P: 781-902-8727    C: 508-380-7194
daniel.kulp@iona.com
http://www.dankulp.com/blog

Mime
View raw message