Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 85003 invoked from network); 5 Feb 2008 04:57:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Feb 2008 04:57:42 -0000 Received: (qmail 72845 invoked by uid 500); 5 Feb 2008 04:57:34 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 72823 invoked by uid 500); 5 Feb 2008 04:57:34 -0000 Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tuscany-dev@ws.apache.org Delivered-To: mailing list tuscany-commits@ws.apache.org Received: (qmail 72810 invoked by uid 99); 5 Feb 2008 04:57:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2008 20:57:34 -0800 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; Tue, 05 Feb 2008 04:57:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 64F411A9832; Mon, 4 Feb 2008 20:57:11 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r618541 - /incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java Date: Tue, 05 Feb 2008 04:57:11 -0000 To: tuscany-commits@ws.apache.org From: lresende@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080205045711.64F411A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lresende Date: Mon Feb 4 20:57:10 2008 New Revision: 618541 URL: http://svn.apache.org/viewvc?rev=618541&view=rev Log: generate web artifacts inside target directory Modified: incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java Modified: incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java?rev=618541&r1=618540&r2=618541&view=diff ============================================================================== --- incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java (original) +++ incubator/tuscany/java/sca/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java Mon Feb 4 20:57:10 2008 @@ -98,11 +98,8 @@ private MavenProject project; public void execute() throws MojoExecutionException { - if (project.getPackaging().equals("pom")) { - return; - } File webxml = - new File(project.getBasedir(), "src/main/webapp/WEB-INF/web.xml".replace('/', File.separatorChar)); + new File(project.getBasedir(), "target/" + project.getArtifactId() + "-" + project.getVersion() + "/WEB-INF/web.xml".replace('/', File.separatorChar)); getLog().info("Generating " + webxml.toString()); String content = setParameter(WEB_XML, "display.name", project.getName()); try { @@ -116,7 +113,7 @@ if (geronimo) { File geronimoxml = - new File(project.getBasedir(), "src/main/webapp/WEB-INF/geronimo-web.xml".replace('/', + new File(project.getBasedir(), "target/" + project.getArtifactId() + "-" + project.getVersion() + "/WEB-INF/geronimo-web.xml".replace('/', File.separatorChar)); getLog().info("Generating " + geronimoxml.toString()); content = setParameter(GERONIMO_WEB_XML, "groupId", project.getGroupId()); --------------------------------------------------------------------- To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org For additional commands, e-mail: tuscany-commits-help@ws.apache.org