Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 88648 invoked from network); 18 Jul 2008 20:33:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Jul 2008 20:33:44 -0000 Received: (qmail 93234 invoked by uid 500); 18 Jul 2008 20:33:44 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 93193 invoked by uid 500); 18 Jul 2008 20:33:44 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 93184 invoked by uid 99); 18 Jul 2008 20:33:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jul 2008 13:33:44 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jul 2008 20:32:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 827542388A5C; Fri, 18 Jul 2008 13:32:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r678028 - in /cxf/trunk: maven-plugins/java2ws-plugin/pom.xml maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java Date: Fri, 18 Jul 2008 20:32:53 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080718203253.827542388A5C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jul 18 13:32:52 2008 New Revision: 678028 URL: http://svn.apache.org/viewvc?rev=678028&view=rev Log: [CXF-1707] Remove use of security manager in the plugin (matches the wsdl2java mojo now) Modified: cxf/trunk/maven-plugins/java2ws-plugin/pom.xml cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java Modified: cxf/trunk/maven-plugins/java2ws-plugin/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/java2ws-plugin/pom.xml?rev=678028&r1=678027&r2=678028&view=diff ============================================================================== --- cxf/trunk/maven-plugins/java2ws-plugin/pom.xml (original) +++ cxf/trunk/maven-plugins/java2ws-plugin/pom.xml Fri Jul 18 13:32:52 2008 @@ -87,14 +87,6 @@ ${project.version} - - ant - ant - - - ant - ant-nodeps - @@ -102,4 +94,4 @@ scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/maven-plugins/java2ws-plugin - \ No newline at end of file + Modified: cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java?rev=678028&r1=678027&r2=678028&view=diff ============================================================================== --- cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java (original) +++ cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java Fri Jul 18 13:32:52 2008 @@ -25,12 +25,11 @@ import java.util.StringTokenizer; import org.apache.cxf.helpers.FileUtils; +import org.apache.cxf.tools.common.CommandInterfaceUtils; 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 @@ -131,13 +130,10 @@ } 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); } @@ -245,17 +241,9 @@ 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); - } + CommandInterfaceUtils.commandCommonMain(); + JavaToWS j2w = new JavaToWS(args.toArray(new String[args.size()])); + j2w.run(); } catch (Throwable e) { getLog().debug(e); throw new MojoExecutionException(e.getMessage(), e); Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java?rev=678028&r1=678027&r2=678028&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java (original) +++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java Fri Jul 18 13:32:52 2008 @@ -72,7 +72,7 @@ return false; } - private void run() throws Exception { + public void run() throws Exception { ToolRunner.runTool(JavaToWSContainer.class, JavaToWSContainer.class .getResourceAsStream("java2ws.xml"), false, args); }