You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2007/10/16 12:31:24 UTC
svn commit: r585100 - in /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java:
./ src/main/java/org/apache/maven/jxr/java/src/xref/
src/test/java/org/apache/maven/jxr/java/src/
Author: vsiveton
Date: Tue Oct 16 03:31:08 2007
New Revision: 585100
URL: http://svn.apache.org/viewvc?rev=585100&view=rev
Log:
MSANDBOX-38: [jxr] Generate Java classes with Antlr
o removed Antlr Java classes
o added maven-antlr-plugin and bumped to antlr:antlrall:2.7.4
o updated test case
Removed:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/xref/JavaLexer.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/xref/JavaTokenTypes.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/xref/JavaTokenTypes.txt
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/xref/JavaXref.java
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml?rev=585100&r1=585099&r2=585100&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/pom.xml Tue Oct 16 03:31:08 2007
@@ -37,8 +37,8 @@
<dependencies>
<dependency>
<groupId>antlr</groupId>
- <artifactId>antlrall</artifactId>
- <version>2.7.1</version>
+ <artifactId>${antlrArtifactId}</artifactId>
+ <version>${antlrVersion}</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
@@ -55,12 +55,46 @@
<artifactId>log4j</artifactId>
<version>1.2.13</version>
</dependency>
+
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.5.0_11</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.6</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antlr-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ <configuration>
+ <grammars>javaG.g</grammars>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <antlrArtifactId>antlrall</antlrArtifactId>
+ <antlrVersion>2.7.4</antlrVersion>
+ </properties>
</project>
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java?rev=585100&r1=585099&r2=585100&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/src/JavaSrcTaskTest.java Tue Oct 16 03:31:08 2007
@@ -23,6 +23,9 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.types.FileSet;
+import org.codehaus.plexus.util.FileUtils;
import junit.framework.TestCase;
@@ -33,6 +36,34 @@
public class JavaSrcTaskTest
extends TestCase
{
+ private static final String BASEDIR = new File( "" ).getAbsolutePath();
+
+ /** {@inheritDoc} */
+ protected void setUp()
+ throws Exception
+ {
+ File srcDir = new File( BASEDIR, "target/unit/src" );
+ if ( !srcDir.exists() )
+ {
+ // MSANDBOX-38: to compare results before and after Antlr generation
+ Project antProject = new Project();
+ antProject.setBasedir( BASEDIR );
+
+ Copy copy = new Copy();
+ copy.setProject( antProject );
+ copy.setTodir( srcDir );
+ FileSet set = new FileSet();
+ set.setDir( new File( BASEDIR, "src/main/java" ) );
+ set.setIncludes( "**/*.java" );
+ copy.addFileset( set );
+ set = new FileSet();
+ set.setDir( new File( BASEDIR, "target/generated-sources/antlr" ) );
+ set.setIncludes( "**/*.java" );
+ copy.addFileset( set );
+ copy.execute();
+ }
+ }
+
/**
* Call JavaSrc task
*
@@ -41,13 +72,11 @@
public void testDefaultExecute()
throws Exception
{
- final String basedir = new File( "" ).getAbsolutePath();
-
- File srcDir = new File( basedir, "src/main/java" );
- File destDir = new File( basedir, "target/unit/jxrdoc-default" );
+ File srcDir = new File( BASEDIR, "target/unit/src" );
+ File destDir = new File( BASEDIR, "target/unit/jxrdoc-default" );
Project antProject = new Project();
- antProject.setBasedir( basedir );
+ antProject.setBasedir( BASEDIR );
JavaSrcTask task = new JavaSrcTask();
task.setProject( antProject );
@@ -81,6 +110,10 @@
generated = new File( destDir, "org/apache/maven/jxr/java/src/JavaSrcTask_java_ref.html" );
assertTrue( generated.exists() );
assertTrue( generated.length() > 0 );
+
+ // MSANDBOX-38: compare results before and after Antlr generation
+ assertEquals( FileUtils.getDirectoryNames( destDir, "**/*", "", false ).size(), 32 );
+ assertEquals( FileUtils.getFileNames( destDir, "**/*", "", false ).size(), 170 );
}
/**
@@ -91,13 +124,11 @@
public void testNullExecute()
throws Exception
{
- final String basedir = new File( "" ).getAbsolutePath();
-
- File srcDir = new File( basedir, "src/main/java" );
- File destDir = new File( basedir, "target/unit/jxrdoc-null" );
+ File srcDir = new File( BASEDIR, "target/unit/src" );
+ File destDir = new File( BASEDIR, "target/unit/jxrdoc-null" );
Project antProject = new Project();
- antProject.setBasedir( basedir );
+ antProject.setBasedir( BASEDIR );
JavaSrcTask task = new JavaSrcTask();
task.setProject( antProject );