werken 2002/07/15 22:53:43
Modified: . jars.list project.xml
src/java/org/apache/maven/jelly/tags/project AddPathTag.java
src/plugins-build/antlr plugin.jelly project.xml
Log:
The ANTLR plugin now works. You'll see a bit of ANTLR complaining
about a SecurityException as maven blocks the call to System.exit(),
but it can be safely ignored. Terence has been pinged.
Revision Changes Path
1.46 +1 -1 jakarta-turbine-maven/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jars.list,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- jars.list 15 Jul 2002 04:36:16 -0000 1.45
+++ jars.list 16 Jul 2002 05:53:42 -0000 1.46
@@ -23,7 +23,7 @@
#-------------------------------------------------------------------------
ant/jars/ant-1.4.1.jar
ant/jars/ant-optional-1.4.1.jar
-antlr/jars/antlr-2.7.1.jar
+antlr/jars/antlrall-2.7.1.jar
bcel/jars/bcel-5.0.jar
checkstyle/jars/checkstyle-2.2.jar
commons-beanutils/jars/commons-beanutils-1.4-dev.jar
1.155 +1 -0 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- project.xml 15 Jul 2002 04:26:31 -0000 1.154
+++ project.xml 16 Jul 2002 05:53:43 -0000 1.155
@@ -522,6 +522,7 @@
<dependency>
<id>antlr</id>
<version>2.7.1</version>
+ <jar>antlrall-2.7.1.jar</jar>
<url>http://www.antlr.org/</url>
</dependency>
1.3 +1 -8
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/AddPathTag.java
Index: AddPathTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/AddPathTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddPathTag.java 14 Jul 2002 16:21:32 -0000 1.2
+++ AddPathTag.java 16 Jul 2002 05:53:43 -0000 1.3
@@ -84,11 +84,8 @@
public void doTag(XMLOutput output)
throws Exception
{
- System.err.println("FOO");
Project project = getProject();
- System.err.println("PROJECT " + project);
-
if (project == null)
{
throw new JellyException("cannot find ant project");
@@ -96,11 +93,7 @@
Path path = (Path) project.getReferences().get(getId());
- System.err.println("PATH ONE(" + getId() + ") : " + path);
-
Path addPath = (Path) project.getReferences().get(getRefid());
-
- System.err.println("PATH TWO(" + getRefid() + ") : " + addPath);
path.append(addPath);
}
1.3 +11 -17 jakarta-turbine-maven/src/plugins-build/antlr/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/antlr/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 15 Jul 2002 04:26:31 -0000 1.2
+++ plugin.jelly 16 Jul 2002 05:53:43 -0000 1.3
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
<project xmlns:j="jelly:core"
+ xmlns:antlr="jelly:antlr"
+ xmlns:util="jelly:util"
xmlns:maven="jelly:org.apache.maven.jelly.tags.project.MavenTagLibrary">
<j:set var="antlrSrcDir" value="${maven.antlr.src.dir}"/>
@@ -21,29 +23,21 @@
<goal name="antlr:generate"
prereqs="antlr:prepare-filesystem">
- <fileScanner var="antlrGrammars">
- <fileset dir="${antlrSrcDir}" includes="**/*.g"/>
- </fileScanner>
- <j:forEach var="grammar" items="${antlrGrammars.iterator()}">
- ANTLRing ${grammar}
-
- ${maven.repo.local}/antlrall-2.7.1.jar
-
- <antlr target="${grammar}"
- fork="off"
- outputdirectory="${maven.build.dir}/antlr"/>
-
- </j:forEach>
+ <util:tokenize var="grammars" delim=" ">
+ ${maven.antlr.grammars}
+ </util:tokenize>
+
+ <antlr:antlr outputDir="${maven.build.dir}/antlr">
+ <j:forEach var="grammar" items="${grammars.iterator()}">
+ <antlr:grammar>${grammar}</antlr:grammar>
+ </j:forEach>
+ </antlr:antlr>
</goal>
<preGoal name="java:compile">
<attainGoal name="antlr:generate"/>
</preGoal>
-
- <postGoal name="java:compile">
- <echo>DONE</echo>
- </postGoal>
</j:if>
1.3 +1 -1 jakarta-turbine-maven/src/plugins-build/antlr/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/antlr/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 15 Jul 2002 04:26:31 -0000 1.2
+++ project.xml 16 Jul 2002 05:53:43 -0000 1.3
@@ -66,7 +66,7 @@
<version>2.7.1</version>
<jar>antlrall-2.7.1.jar</jar>
<metaEntries>
- <metaEntry>classloader:$forehead-root$</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
