Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 81708 invoked from network); 30 Jul 2007 03:18:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Jul 2007 03:18:20 -0000 Received: (qmail 7071 invoked by uid 500); 30 Jul 2007 03:18:19 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 6953 invoked by uid 500); 30 Jul 2007 03:18:19 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 6942 invoked by uid 500); 30 Jul 2007 03:18:19 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 6939 invoked by uid 99); 30 Jul 2007 03:18:19 -0000 Received: from Unknown (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Jul 2007 20:18:19 -0700 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, 30 Jul 2007 03:18:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4D9D41A981C; Sun, 29 Jul 2007 20:17:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r560850 - in /webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin: pom.xml src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java Date: Mon, 30 Jul 2007 03:17:58 -0000 To: axis2-cvs@ws.apache.org From: dims@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070730031758.4D9D41A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dims Date: Sun Jul 29 20:17:57 2007 New Revision: 560850 URL: http://svn.apache.org/viewvc?view=rev&rev=560850 Log: - Better default for the wsdl file - Behave better if the output location is not specified in the pom configuration - add dependency for RPC MR - add checks for null's for params that are not specified. Modified: webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java Modified: webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?view=diff&rev=560850&r1=560849&r2=560850 ============================================================================== --- webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original) +++ webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Sun Jul 29 20:17:57 2007 @@ -42,6 +42,11 @@ ${version} + org.apache.axis2 + axis2-adb + ${version} + + org.apache.maven maven-plugin-api Modified: webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?view=diff&rev=560850&r1=560849&r2=560850 ============================================================================== --- webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java (original) +++ webservices/axis2/branches/java/1_3/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java Sun Jul 29 20:17:57 2007 @@ -97,7 +97,7 @@ /** * Name of the service file, which is being generated. - * @parameter expression="${axis2.java2wsdl.outputFileName}" default-value="${project.build.outputDirectory}/generated-resources/java2wsdl/service.xml" + * @parameter expression="${axis2.java2wsdl.outputFileName}" default-value="${project.build.directory}/generated-resources/service.wsdl" */ private String outputFileName; @@ -213,8 +213,11 @@ addToOptionMap( optionMap, Java2WSDLConstants.SERVICE_NAME_OPTION, serviceName); - File f = new File(project.getBasedir(), outputFileName); - File dir = f.getParentFile(); + File outputFile = new File(outputFileName); + if(!outputFile.isAbsolute()){ + outputFile = new File(project.getBasedir(), outputFileName); + } + File dir = outputFile.getParentFile(); if (!dir.isDirectory()) { dir.mkdirs(); } @@ -223,7 +226,7 @@ dir.getPath() ); addToOptionMap( optionMap, Java2WSDLConstants.OUTPUT_FILENAME_OPTION, - f.getName() ); + outputFile.getName() ); Set artifacts = project.getArtifacts(); String[] artifactFileNames = new String[artifacts.size() + 1]; @@ -237,45 +240,65 @@ Java2WSDLConstants.CLASSPATH_OPTION, artifactFileNames); - addToOptionMap(optionMap, - Java2WSDLConstants.STYLE_OPTION, - style); - - addToOptionMap(optionMap, - Java2WSDLConstants.USE_OPTION, - use); - - addToOptionMap(optionMap, - Java2WSDLConstants.WSDL_VERSION_OPTION, - wsdlVersion); - - addToOptionMap(optionMap, - Java2WSDLConstants.DOC_LIT_BARE, - docLitBare); - - addToOptionMap(optionMap, - Java2WSDLConstants.LOCATION_OPTION, - locationUri); - - addToOptionMap(optionMap, - Java2WSDLConstants.NAMESPACE_GENERATOR_OPTION, - nsGenClassName); - - addToOptionMap(optionMap, - Java2WSDLConstants.SCHEMA_GENERATOR_OPTION, - schemaGenClassName); - - addToOptionMap(optionMap, - Java2WSDLConstants.ATTR_FORM_DEFAULT_OPTION, - attrFormDefault); - - addToOptionMap(optionMap, - Java2WSDLConstants.ELEMENT_FORM_DEFAULT_OPTION, - elementFormDefault); - - addToOptionMap(optionMap, - Java2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION, - extraClasses); + if (style != null) { + addToOptionMap(optionMap, + Java2WSDLConstants.STYLE_OPTION, + style); + } + + if (use != null) { + addToOptionMap(optionMap, + Java2WSDLConstants.USE_OPTION, + use); + } + + if (wsdlVersion != null) { + addToOptionMap(optionMap, + Java2WSDLConstants.WSDL_VERSION_OPTION, + wsdlVersion); + } + + if (docLitBare != null) { + addToOptionMap(optionMap, + Java2WSDLConstants.DOC_LIT_BARE, + docLitBare); + } + + if (locationUri != null) { + addToOptionMap(optionMap, + Java2WSDLConstants.LOCATION_OPTION, + locationUri); + } + + if (nsGenClassName != null) { + addToOptionMap(optionMap, + Java2WSDLConstants.NAMESPACE_GENERATOR_OPTION, + nsGenClassName); + } + + if (schemaGenClassName != null) { + addToOptionMap(optionMap, + Java2WSDLConstants.SCHEMA_GENERATOR_OPTION, + schemaGenClassName); + } + + if (attrFormDefault != null) { + addToOptionMap(optionMap, + Java2WSDLConstants.ATTR_FORM_DEFAULT_OPTION, + attrFormDefault); + } + + if (elementFormDefault != null) { + addToOptionMap(optionMap, + Java2WSDLConstants.ELEMENT_FORM_DEFAULT_OPTION, + elementFormDefault); + } + + if (extraClasses != null && extraClasses.length > 0) { + addToOptionMap(optionMap, + Java2WSDLConstants.EXTRA_CLASSES_DEFAULT_OPTION, + extraClasses); + } ArrayList list = new ArrayList(); Iterator iterator = package2Namespace.entrySet().iterator(); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org