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 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -206,9 +206,9 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.3</version>
<configuration>
- <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
+
<configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
<excludes>org/apache/commons/jexl/parser/*.java</excludes>
- <headerFile>${basedir}/src/conf/header.txt</headerFile>
+ <headerFile>${basedir}/src/main/config/header.txt</headerFile>
<enableRulesSummary>false</enableRulesSummary>
</configuration>
</plugin>
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 =
