From commits-return-7712-apmail-commons-commits-archive=commons.apache.org@commons.apache.org Sun Aug 02 20:49:53 2009 Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 43689 invoked from network); 2 Aug 2009 20:49:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Aug 2009 20:49:53 -0000 Received: (qmail 57825 invoked by uid 500); 2 Aug 2009 20:49:57 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 57742 invoked by uid 500); 2 Aug 2009 20:49:57 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 57733 invoked by uid 99); 2 Aug 2009 20:49:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Aug 2009 20:49:57 +0000 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; Sun, 02 Aug 2009 20:49:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 35FC523888E5; Sun, 2 Aug 2009 20:49:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r800145 - in /commons/proper/jexl/branches/2.0: ./ src/assembly/ src/conf/ src/main/assembly/ src/main/config/ src/test-scripts/ src/test/java/org/apache/commons/jexl/ src/test/scripts/ Date: Sun, 02 Aug 2009 20:49:35 -0000 To: commits@commons.apache.org From: rahul@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090802204935.35FC523888E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rahul Date: Sun Aug 2 20:49:34 2009 New Revision: 800145 URL: http://svn.apache.org/viewvc?rev=800145&view=rev Log: Move to standard m2 directory layout: - src/assembly to src/main/assembly - src/conf to src/main/config Additionally, moved src/test-scripts to src/test/scripts. Related changes to POM and tests. Added: commons/proper/jexl/branches/2.0/src/main/assembly/ (props changed) - copied from r800143, commons/proper/jexl/branches/2.0/src/assembly/ commons/proper/jexl/branches/2.0/src/main/config/ (props changed) - copied from r800143, commons/proper/jexl/branches/2.0/src/conf/ commons/proper/jexl/branches/2.0/src/test/scripts/ (props changed) - copied from r800143, commons/proper/jexl/branches/2.0/src/test-scripts/ Removed: commons/proper/jexl/branches/2.0/src/assembly/ commons/proper/jexl/branches/2.0/src/conf/ commons/proper/jexl/branches/2.0/src/test-scripts/ Modified: commons/proper/jexl/branches/2.0/pom.xml commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptFactoryTest.java commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptTest.java Modified: commons/proper/jexl/branches/2.0/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/pom.xml?rev=800145&r1=800144&r2=800145&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/pom.xml (original) +++ commons/proper/jexl/branches/2.0/pom.xml Sun Aug 2 20:49:34 2009 @@ -155,8 +155,8 @@ maven-assembly-plugin - src/assembly/bin.xml - src/assembly/src.xml + src/main/assembly/bin.xml + src/main/assembly/src.xml gnu @@ -206,9 +206,9 @@ maven-checkstyle-plugin 2.3 - ${basedir}/src/conf/checkstyle.xml + ${basedir}/src/main/config/checkstyle.xml org/apache/commons/jexl/parser/*.java - ${basedir}/src/conf/header.txt + ${basedir}/src/main/config/header.txt false Propchange: commons/proper/jexl/branches/2.0/src/main/assembly/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: commons/proper/jexl/branches/2.0/src/main/config/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 2 20:49:34 2009 @@ -0,0 +1,2 @@ + +checkstyle.cache Propchange: commons/proper/jexl/branches/2.0/src/main/config/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptFactoryTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptFactoryTest.java?rev=800145&r1=800144&r2=800145&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptFactoryTest.java (original) +++ commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptFactoryTest.java Sun Aug 2 20:49:34 2009 @@ -25,7 +25,7 @@ * @since 1.1 */ public class ScriptFactoryTest extends JexlTestCase { - static final String TEST1 = "src/test-scripts/test1.jexl"; + static final String TEST1 = "src/test/scripts/test1.jexl"; /** * Creates a new test case. * @param name the test case name. @@ -97,7 +97,7 @@ * @throws Exception on a parse error. */ public void testCreateFromURL() throws Exception { - URL testUrl = new File("src/test-scripts/test1.jexl").toURI().toURL(); + URL testUrl = new File("src/test/scripts/test1.jexl").toURI().toURL(); assertNotNull("No script created", ScriptFactory.createScript(testUrl)); } Modified: commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptTest.java?rev=800145&r1=800144&r2=800145&view=diff ============================================================================== --- commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptTest.java (original) +++ commons/proper/jexl/branches/2.0/src/test/java/org/apache/commons/jexl/ScriptTest.java Sun Aug 2 20:49:34 2009 @@ -24,7 +24,7 @@ * @since 1.1 */ public class ScriptTest extends JexlTestCase { - static final String TEST1 = "src/test-scripts/test1.jexl"; + static final String TEST1 = "src/test/scripts/test1.jexl"; // test class for testScriptUpdatesContext // making this class private static will cause the test to fail. @@ -73,7 +73,7 @@ } public void testScriptFromURL() throws Exception { - URL testUrl = new File("src/test-scripts/test1.jexl").toURI().toURL(); + URL testUrl = new File("src/test/scripts/test1.jexl").toURI().toURL(); Script s = ScriptFactory.createScript(testUrl); JexlContext jc = JexlHelper.createContext(); jc.getVars().put("out", System.out); Propchange: commons/proper/jexl/branches/2.0/src/test/scripts/ ------------------------------------------------------------------------------ svn:mergeinfo =