Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 10621 invoked from network); 18 May 2007 16:40:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 May 2007 16:40:49 -0000 Received: (qmail 39410 invoked by uid 500); 18 May 2007 16:40:54 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 39366 invoked by uid 500); 18 May 2007 16:40:54 -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 39357 invoked by uid 99); 18 May 2007 16:40:53 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2007 09:40:53 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Fri, 18 May 2007 09:40:44 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7FC111A982D; Fri, 18 May 2007 09:39:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r539517 [9/9] - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/ api/src/main/java/org/apache/cxf/binding/ api/src/main/java/org/apache/cxf/clustering/ api/src/main/java/org/apache/cxf/endpoint/ api/src/main/java/org/apache/cxf/fe... Date: Fri, 18 May 2007 16:39:48 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070518163956.7FC111A982D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/locator.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/locator.wsdl?view=diff&rev=539517&r1=539516&r2=539517 ============================================================================== --- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/locator.wsdl (original) +++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/locator.wsdl Fri May 18 09:39:38 2007 @@ -1,502 +1,502 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Extensible endpoint identity type. - - - - - - - - - - Input message element for "registerPeerManager" operation. - - - - - - - - - - Output message element for "registerPeerManager" operation. - - - - - - - - - - - Input message element for "deregisterPeerManager" operation. - - - - - - - - - - - Input message element for "registerEndpoint" operation. - - - - - - - - - - - - Input message element for "deregisterEndpoint" operation. - - - - - - - - - - - - Input message element for "lookupEndpoint" operation. - - - - - - - - - - Output message element for "lookupEndpoint" operation. - - - - - - - - - - - Output message element for "listEndpoints" operation. - - - - - - - - - - - - - - - - - Input message element for "queryEndpoints" operation. - - - - - - - - - - - - - - - - - Fault exception when no endpoint available. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Register a peer endpoint manager with the locator service. Once registered, - the Locator associates the peer_id with the peer endpoint manager. - - - - - - - Deregister a peer endpoint manager with the locator service. Deregistering a - peer manager also deregisters all endpoints that were registered by it. - - - - - - - Register an endpoint to become available in the locator. Once registered, an - endpoint will be returned in response to the "list_endpoints" and "query_endpoints" operations. - - - - - - - Deregister an endpoint from the locator. Once deregistered an endpoint will - no longer be returned in response to the "list_endpoints" and "query_endpoints operations. - - - - - - Lookup an endpoint from the locator based on a QName. - - - - - - List all endpoints available in the locator. - - - - - List all endpoints available in the locator based on selection filters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Extensible endpoint identity type. + + + + + + + + + + Input message element for "registerPeerManager" operation. + + + + + + + + + + Output message element for "registerPeerManager" operation. + + + + + + + + + + + Input message element for "deregisterPeerManager" operation. + + + + + + + + + + + Input message element for "registerEndpoint" operation. + + + + + + + + + + + + Input message element for "deregisterEndpoint" operation. + + + + + + + + + + + + Input message element for "lookupEndpoint" operation. + + + + + + + + + + Output message element for "lookupEndpoint" operation. + + + + + + + + + + + Output message element for "listEndpoints" operation. + + + + + + + + + + + + + + + + + Input message element for "queryEndpoints" operation. + + + + + + + + + + + + + + + + + Fault exception when no endpoint available. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Register a peer endpoint manager with the locator service. Once registered, + the Locator associates the peer_id with the peer endpoint manager. + + + + + + + Deregister a peer endpoint manager with the locator service. Deregistering a + peer manager also deregisters all endpoints that were registered by it. + + + + + + + Register an endpoint to become available in the locator. Once registered, an + endpoint will be returned in response to the "list_endpoints" and "query_endpoints" operations. + + + + + + + Deregister an endpoint from the locator. Once deregistered an endpoint will + no longer be returned in response to the "list_endpoints" and "query_endpoints operations. + + + + + + Lookup an endpoint from the locator based on a QName. + + + + + + List all endpoints available in the locator. + + + + + List all endpoints available in the locator based on selection filters. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/locator.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/locator.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/locator.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/wsdlgen-plugin/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/wsdlgen-plugin/pom.xml?view=diff&rev=539517&r1=539516&r2=539517 ============================================================================== --- incubator/cxf/trunk/wsdlgen-plugin/pom.xml (original) +++ incubator/cxf/trunk/wsdlgen-plugin/pom.xml Fri May 18 09:39:38 2007 @@ -1,72 +1,72 @@ - - 4.0.0 - org.apache.cxf - cxf-wsdlgen-plugin - maven-plugin - 2.0-incubator-SNAPSHOT - Apache CXF WSDL Generation Maven2 Plugin - http://cwiki.apache.org/CXF - - - - org.apache.cxf - cxf-parent - 2.0-incubator-SNAPSHOT - ../parent/pom.xml - - - - - junit - junit - test - - - - org.apache.maven - maven-plugin-api - provided - - - org.apache.maven - maven-project - provided - - - org.apache.maven - maven-artifact - provided - - - - org.apache.cxf - cxf-tools-java2wsdl - ${project.version} - - - - ant - ant - - - ant - ant-nodeps - - - - - - - java.net - https://maven-repository.dev.java.net/repository/ - legacy - - - - - scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/wsdlgen-plugin - scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/wsdlgen-plugin - http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-wsdlgen-plugin - - + + 4.0.0 + org.apache.cxf + cxf-wsdlgen-plugin + maven-plugin + 2.0-incubator-SNAPSHOT + Apache CXF WSDL Generation Maven2 Plugin + http://cwiki.apache.org/CXF + + + + org.apache.cxf + cxf-parent + 2.0-incubator-SNAPSHOT + ../parent/pom.xml + + + + + junit + junit + test + + + + org.apache.maven + maven-plugin-api + provided + + + org.apache.maven + maven-project + provided + + + org.apache.maven + maven-artifact + provided + + + + org.apache.cxf + cxf-tools-java2wsdl + ${project.version} + + + + ant + ant + + + ant + ant-nodeps + + + + + + + java.net + https://maven-repository.dev.java.net/repository/ + legacy + + + + + scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/wsdlgen-plugin + scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/wsdlgen-plugin + http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-wsdlgen-plugin + + Propchange: incubator/cxf/trunk/wsdlgen-plugin/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/wsdlgen-plugin/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/wsdlgen-plugin/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/wsdlgen-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSDLMojo.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/wsdlgen-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSDLMojo.java?view=diff&rev=539517&r1=539516&r2=539517 ============================================================================== --- incubator/cxf/trunk/wsdlgen-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSDLMojo.java (original) +++ incubator/cxf/trunk/wsdlgen-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSDLMojo.java Fri May 18 09:39:38 2007 @@ -1,196 +1,196 @@ -/** - * 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 org.apache.cxf.helpers.FileUtils; -import org.apache.cxf.tools.java2wsdl.JavaToWSDL; -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 java2wsdl - * @description CXF Java To WSDL Tool - */ -public class Java2WSDLMojo extends AbstractMojo { - /** - * @parameter - * @required - */ - String className; - - /** - * @parameter expression="${project.build.outputDirectory}" - * @required - */ - String classpath; - - /** - * @parameter - */ - String outputFile; - - /** - * @parameter - */ - Boolean soap12; - - /** - * @parameter - */ - String targetNamespace; - - /** - * @parameter - */ - String serviceName; - - /** - * @parameter - */ - Boolean verbose; - - /** - * @parameter - */ - Boolean quiet; - - /** - * @parameter expression="${project.compileClasspathElements}" - * @required - */ - List classpathElements; - - /** - * @parameter expression="${project}" - * @required - */ - MavenProject project; - - public void execute() throws MojoExecutionException { - File classesDir = new File(classpath); - FileUtils.mkDir(classesDir); - - 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 args = new ArrayList(); - - // 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()); - } - } - - // 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"); - } - - // classname arg - args.add(className); - - String exitOnFinish = System.getProperty("exitOnFinish", ""); - try { - JavaToWSDL.main(args.toArray(new String[args.size()])); - } catch (ExitException e) { - if (e.getStatus() != 0) { - throw e; - } - } finally { - System.setProperty("exitOnFinish", exitOnFinish); - } - } -} +/** + * 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 org.apache.cxf.helpers.FileUtils; +import org.apache.cxf.tools.java2wsdl.JavaToWSDL; +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 java2wsdl + * @description CXF Java To WSDL Tool + */ +public class Java2WSDLMojo extends AbstractMojo { + /** + * @parameter + * @required + */ + String className; + + /** + * @parameter expression="${project.build.outputDirectory}" + * @required + */ + String classpath; + + /** + * @parameter + */ + String outputFile; + + /** + * @parameter + */ + Boolean soap12; + + /** + * @parameter + */ + String targetNamespace; + + /** + * @parameter + */ + String serviceName; + + /** + * @parameter + */ + Boolean verbose; + + /** + * @parameter + */ + Boolean quiet; + + /** + * @parameter expression="${project.compileClasspathElements}" + * @required + */ + List classpathElements; + + /** + * @parameter expression="${project}" + * @required + */ + MavenProject project; + + public void execute() throws MojoExecutionException { + File classesDir = new File(classpath); + FileUtils.mkDir(classesDir); + + 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 args = new ArrayList(); + + // 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()); + } + } + + // 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"); + } + + // classname arg + args.add(className); + + String exitOnFinish = System.getProperty("exitOnFinish", ""); + try { + JavaToWSDL.main(args.toArray(new String[args.size()])); + } catch (ExitException e) { + if (e.getStatus() != 0) { + throw e; + } + } finally { + System.setProperty("exitOnFinish", exitOnFinish); + } + } +} Propchange: incubator/cxf/trunk/wsdlgen-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSDLMojo.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/wsdlgen-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSDLMojo.java ------------------------------------------------------------------------------ svn:keywords = Rev Date