jvanzyl 02/04/16 14:15:20
Modified: . jars.list project.xml
src/java/org/apache/maven BaseProjectTask.java
MavenUtils.java
src/java/org/apache/maven/executor ProjectExecutor.java
src/java/org/apache/maven/transformer SourceTransformer.java
src/test/org/apache/maven/project ProjectMapperTest.java
WorkspaceMapperTest.java
Log:
Moving to commons-xo.
Revision Changes Path
1.5 +2 -2 jakarta-turbine-maven/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jars.list,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jars.list 11 Apr 2002 06:34:25 -0000 1.4
+++ jars.list 16 Apr 2002 21:15:19 -0000 1.5
@@ -24,17 +24,17 @@
antlr.jar
bcel.jar
checkstyle-2.1.jar
-commons-beanutils.jar
+commons-beanutils-dev.jar
commons-collections.jar
commons-graph.jar
commons-io.jar
commons-lang-0.1-dev.jar
commons-util-1.0-rc2-dev.jar
+commons-xo-1.0-dev.jar
dom4j-1.3.jar
jdepend.jar
log4j-1.1.3.jar
oro.jar
regexp-1.2.jar
-stratum-1.0-b2-dev.jar
velocity-1.3-dev.jar
velocity-dvsl-0.43.jar
1.62 +7 -5 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- project.xml 11 Apr 2002 14:11:32 -0000 1.61
+++ project.xml 16 Apr 2002 21:15:19 -0000 1.62
@@ -170,11 +170,13 @@
-->
<dependency>
- <name>jakarta-turbine-stratum</name>
+ <name>commons-xo</name>
<type>required</type>
- <version>1.0-b2-dev</version>
- <jar>stratum-1.0-b2-dev.jar</jar>
- <url>http://jakarta.apache.org/turbine/stratum/</url>
+ <version>1.0-dev</version>
+ <jar>commons-xo-1.0-dev.jar</jar>
+ <!--
+ <url>http://jakarta.apache.org/commons/xo/</url>
+ -->
</dependency>
<dependency>
@@ -247,7 +249,7 @@
<name>commons-beanutils</name>
<type>required</type>
<version>1.0</version>
- <jar>commons-beanutils.jar</jar>
+ <jar>commons-beanutils-dev.jar</jar>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
1.5 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/BaseProjectTask.java
Index: BaseProjectTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/BaseProjectTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseProjectTask.java 11 Apr 2002 11:56:26 -0000 1.4
+++ BaseProjectTask.java 16 Apr 2002 21:15:19 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.maven.project.Project;
-import org.apache.stratum.xo.Mapper;
+import org.apache.commons.xo.Mapper;
import org.apache.velocity.context.Context;
import org.apache.velocity.VelocityContext;
@@ -74,7 +74,7 @@
* An ant task for creating an xml schema from an sql schema
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: BaseProjectTask.java,v 1.4 2002/04/11 11:56:26 jvanzyl Exp $
+ * @version $Id: BaseProjectTask.java,v 1.5 2002/04/16 21:15:19 jvanzyl Exp $
*/
public class BaseProjectTask
extends TexenTask
1.10 +2 -2 jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MavenUtils.java 6 Apr 2002 16:05:27 -0000 1.9
+++ MavenUtils.java 16 Apr 2002 21:15:19 -0000 1.10
@@ -61,7 +61,7 @@
import org.apache.maven.project.Project;
-import org.apache.stratum.xo.Mapper;
+import org.apache.commons.xo.Mapper;
import org.apache.tools.ant.DirectoryScanner;
@@ -71,7 +71,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: MavenUtils.java,v 1.9 2002/04/06 16:05:27 jvanzyl Exp $
+ * @version $Id: MavenUtils.java,v 1.10 2002/04/16 21:15:19 jvanzyl Exp $
*/
public class MavenUtils
{
1.2 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/executor/ProjectExecutor.java
Index: ProjectExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/executor/ProjectExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectExecutor.java 28 Feb 2002 22:37:25 -0000 1.1
+++ ProjectExecutor.java 16 Apr 2002 21:15:20 -0000 1.2
@@ -61,7 +61,7 @@
import org.apache.maven.MavenUtils;
import org.apache.maven.project.Project;
-import org.apache.stratum.xo.Mapper;
+import org.apache.commons.xo.Mapper;
/**
* An executor that uses the Template Method pattern to alleviate the
@@ -70,7 +70,7 @@
* in any desired fashion.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectExecutor.java,v 1.1 2002/02/28 22:37:25 jvanzyl Exp $
+ * @version $Id: ProjectExecutor.java,v 1.2 2002/04/16 21:15:20 jvanzyl Exp $
*/
public abstract class ProjectExecutor
extends AbstractExecutor
1.4 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java
Index: SourceTransformer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SourceTransformer.java 28 Feb 2002 23:26:49 -0000 1.3
+++ SourceTransformer.java 16 Apr 2002 21:15:20 -0000 1.4
@@ -59,7 +59,7 @@
import java.util.Iterator;
import org.apache.oro.text.perl.Perl5Util;
-import org.apache.stratum.xo.Mapper;
+import org.apache.commons.xo.Mapper;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
@@ -67,7 +67,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: SourceTransformer.java,v 1.3 2002/02/28 23:26:49 jvanzyl Exp $
+ * @version $Id: SourceTransformer.java,v 1.4 2002/04/16 21:15:20 jvanzyl Exp $
* @todo Get fileContentsToString() in the commons and break vel dep.
*/
public class SourceTransformer
1.10 +9 -6
jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java
Index: ProjectMapperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProjectMapperTest.java 11 Apr 2002 18:41:31 -0000 1.9
+++ ProjectMapperTest.java 16 Apr 2002 21:15:20 -0000 1.10
@@ -58,7 +58,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.lang.Strings;
-import org.apache.stratum.xo.Mapper;
+import org.apache.commons.xo.Mapper;
public class ProjectMapperTest
extends TestCase
@@ -116,17 +116,20 @@
((Developer)p.getDevelopers().get(0)).getEmail());
// Test Dependencies
- assertEquals("jakarta-turbine-stratum",
+ assertEquals("commons-xo",
((Dependency)p.getDependencies().get(0)).getName());
assertEquals("required",
((Dependency)p.getDependencies().get(0)).getType());
- assertEquals("1.0-b2-dev",
+ assertEquals("1.0-dev",
((Dependency)p.getDependencies().get(0)).getVersion());
- assertEquals("stratum-1.0-b2-dev.jar",
+ assertEquals("commons-xo-1.0-dev.jar",
((Dependency)p.getDependencies().get(0)).getJar());
- assertEquals("http://jakarta.apache.org/turbine/stratum/";,
+
+ /*
+ assertEquals("http://jakarta.apache.org/commons/xo/";,
((Dependency)p.getDependencies().get(0)).getUrl());
-
+ */
+
// Test Source Directories
assertEquals("src/java",
(String)p.getBuild().getSourceDirectories().get(0));
1.2 +1 -1
jakarta-turbine-maven/src/test/org/apache/maven/project/WorkspaceMapperTest.java
Index: WorkspaceMapperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/WorkspaceMapperTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkspaceMapperTest.java 16 Mar 2002 04:54:21 -0000 1.1
+++ WorkspaceMapperTest.java 16 Apr 2002 21:15:20 -0000 1.2
@@ -4,7 +4,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.stratum.xo.Mapper;
+import org.apache.commons.xo.Mapper;
public class WorkspaceMapperTest
extends TestCase
