Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 1356 invoked from network); 22 Aug 2006 23:03:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Aug 2006 23:03:16 -0000 Received: (qmail 97917 invoked by uid 500); 22 Aug 2006 23:03:15 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 97870 invoked by uid 500); 22 Aug 2006 23:03:14 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 97859 invoked by uid 500); 22 Aug 2006 23:03:14 -0000 Received: (qmail 97856 invoked by uid 99); 22 Aug 2006 23:03:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2006 16:03:14 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2006 16:03:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 806C21A981A; Tue, 22 Aug 2006 16:02:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r433792 - in /ant/core/trunk/src: etc/testcases/taskdefs/rmic/rmic.xml main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java Date: Tue, 22 Aug 2006 23:02:52 -0000 To: ant-cvs@apache.org From: stevel@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060822230253.806C21A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: stevel Date: Tue Aug 22 16:02:51 2006 New Revision: 433792 URL: http://svn.apache.org/viewvc?rev=433792&view=rev Log: Fix IDL/IIOP handling of rmic-with-backwards compat; added tests for everything working. Modified: ant/core/trunk/src/etc/testcases/taskdefs/rmic/rmic.xml ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java Modified: ant/core/trunk/src/etc/testcases/taskdefs/rmic/rmic.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/taskdefs/rmic/rmic.xml?rev=433792&r1=433791&r2=433792&view=diff ============================================================================== --- ant/core/trunk/src/etc/testcases/taskdefs/rmic/rmic.xml (original) +++ ant/core/trunk/src/etc/testcases/taskdefs/rmic/rmic.xml Tue Aug 22 16:02:51 2006 @@ -263,4 +263,15 @@ + + + + + + + + + + + Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java?rev=433792&r1=433791&r2=433792&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java Tue Aug 22 16:02:51 2006 @@ -192,7 +192,7 @@ //handle the many different stub options. String stubVersion = attributes.getStubVersion(); //default is compatibility - String stubOption=STUB_COMPAT; + String stubOption = null; if (null != stubVersion) { if ("1.1".equals(stubVersion)) { stubOption = STUB_1_1; @@ -202,12 +202,21 @@ stubOption = STUB_COMPAT; } else { //anything else - attributes.log("Unknown stub option "+stubVersion); + attributes.log("Unknown stub option " + stubVersion); //do nothing with the value? or go -v+stubVersion?? } } - cmd.createArgument().setValue(stubOption); - + //for java1.5+, we generate compatible stubs, that is, unless + //the caller asked for IDL or IIOP support. + if (stubOption == null && + !attributes.getIiop() && + !attributes.getIdl()) { + stubOption = STUB_COMPAT; + } + if(stubOption!=null) { + //set the non-null stubOption + cmd.createArgument().setValue(stubOption); + } if (null != attributes.getSourceBase()) { cmd.createArgument().setValue("-keepgenerated"); } Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java?rev=433792&r1=433791&r2=433792&view=diff ============================================================================== --- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java (original) +++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java Tue Aug 22 16:02:51 2006 @@ -213,6 +213,24 @@ } /** + * test that verifies that IDL compiles. + * + * @throws Exception + */ + public void testIDL() throws Exception { + executeTarget("testIDL"); + } + + /** + * test that verifies that IIOP compiles. + * + * @throws Exception + */ + public void testIIOP() throws Exception { + executeTarget("testIIOP"); + } + + /** * this little bunny verifies that we can load stuff, and that * a failure to execute is turned into a fault */ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org