You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/23 00:39:42 UTC
cvs commit: jakarta-turbine-maven/src/test-java-parser Input.java
jvanzyl 02/02/22 15:39:42
Modified: src/dvsl/gump convert-project.dvsl
src/templates/build build.xml
src/test/org/apache/maven/java TestSourceTool.java
src/test/org/apache/maven/project TestProjectMapper.java
Added: src/test-java-parser Input.java
Removed: src/test/org/apache/maven/java Input.java
Log:
- making separate directories for the test class inputs, be nice to have
a standard place for these things.
Revision Changes Path
1.3 +5 -0 jakarta-turbine-maven/src/dvsl/gump/convert-project.dvsl
Index: convert-project.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/gump/convert-project.dvsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- convert-project.dvsl 22 Feb 2002 17:22:32 -0000 1.2
+++ convert-project.dvsl 22 Feb 2002 23:39:41 -0000 1.3
@@ -1,11 +1,16 @@
#match("project")
<module name="$context.applyTemplates("name")"/>
+
<description>$context.applyTemplates("shortDescription")</description>
<url href="$context.applyTemplates("url")"/>
<cvs repository="$context.applyTemplates("repository")"/>
<project name="$context.applyTemplates("name")">
+
+ <!-- Standard Maven target to produce Javadocs, source -->
+ <!-- and binary distributions. -->
<ant target="dist"/>
+
$context.applyTemplates("//dependencies/dependency")
<work nested="target/classes"/>
<home nested="target"/>
1.7 +11 -6 jakarta-turbine-maven/src/templates/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 22 Feb 2002 21:48:55 -0000 1.6
+++ build.xml 22 Feb 2002 23:39:41 -0000 1.7
@@ -14,12 +14,6 @@
<!-- Set default values for the build -->
<property file="default.properties" />
- <!-- W A R N I N G
-
- Put maven.jar in your ${ant.home}/lib directory
-
- -->
-
<!-- ================================================================== -->
<!-- I N I T I A L I Z E -->
<!-- ================================================================== -->
@@ -464,4 +458,15 @@
<delete dir="${build.dir}"/>
</target>
+
+ <!-- ================================================================== -->
+ <!-- C O N V E N I E N C E D E L E G A T O R S -->
+ <!-- ================================================================== -->
+
+ <target
+ name="test">
+
+ <ant buildfile="build-test.xml"/>
+ </target>
+
</project>
1.2 +1 -1 jakarta-turbine-maven/src/test/org/apache/maven/java/TestSourceTool.java
Index: TestSourceTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/java/TestSourceTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestSourceTool.java 19 Feb 2002 18:10:13 -0000 1.1
+++ TestSourceTool.java 22 Feb 2002 23:39:41 -0000 1.2
@@ -37,7 +37,7 @@
try
{
- st.parse("src/test/org/apache/maven/java/Input.java");
+ st.parse("src/test-java-parser/Input.java");
// Check the package statement
List ps = dv.getPackageStatements();
1.5 +1 -1 jakarta-turbine-maven/src/test/org/apache/maven/project/TestProjectMapper.java
Index: TestProjectMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/TestProjectMapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestProjectMapper.java 22 Feb 2002 01:38:14 -0000 1.4
+++ TestProjectMapper.java 22 Feb 2002 23:39:41 -0000 1.5
@@ -68,7 +68,7 @@
((Dependency)p.getDependencies().get(0)).getType());
assertEquals("0.1",
((Dependency)p.getDependencies().get(0)).getVersion());
- assertEquals("stratum-0.1.jar",
+ assertEquals("stratum-0.1-dev.jar",
((Dependency)p.getDependencies().get(0)).getJar());
1.1 jakarta-turbine-maven/src/test-java-parser/Input.java
Index: Input.java
===================================================================
package org.apache.turbine;
import java.io.*;
import org.apache.turbine.RunData;
import java.net.URLEncoder;
import java.util.Enumeration;
import java.util.Vector;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.Turbine;
import org.apache.turbine.ParameterParser;
public class DynamicURI
{
public void methodA()
{
}
public Object methodB()
{
}
public void methodC()
{
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>