- Revision
- 1137
- Author
- rfscholte
- Date
- 2011-03-23 15:11:58 -0500 (Wed, 23 Mar 2011)
Log Message
remove custom folders for sources and resources, follow maven-convention fix paths in tests
Modified Paths
Diff
Modified: trunk/qdox/pom.xml (1136 => 1137)
--- trunk/qdox/pom.xml 2011-03-23 19:51:44 UTC (rev 1136) +++ trunk/qdox/pom.xml 2011-03-23 20:11:58 UTC (rev 1137) @@ -159,13 +159,6 @@ <version>1.0-beta-2</version> </extension> </extensions> - <sourceDirectory>${basedir}/src/java</sourceDirectory> - <testSourceDirectory>${basedir}/src/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${basedir}/src/test-resources</directory> - </testResource> - </testResources> <pluginManagement> <plugins> @@ -231,7 +224,7 @@ <version>1.2</version> <executions> <execution> - <id>javasourceparser</id> + <id>javacommentparser</id> <phase>generate-sources</phase> <goals> <goal>exec</goal> @@ -242,17 +235,15 @@ <argument>-v</argument> <argument>-Jnorun</argument> <argument>-Jnoconstruct</argument> - <argument>-Jclass=Parser</argument> - <argument>-Jimplements=CommentHandler</argument> - <argument>-Jsemantic=Value</argument> + <argument>-Jclass=DefaultJavaCommentParser</argument> <argument>-Jpackage=com.thoughtworks.qdox.parser.impl</argument> - <argument>${basedir}/src/grammar/parser.y</argument> + <argument>${basedir}/src/grammar/commentparser.y</argument> </arguments> <workingDirectory>${project.build.directory}/generated-sources/parser/com/thoughtworks/qdox/parser/impl</workingDirectory> </configuration> </execution> <execution> - <id>javacommentparser</id> + <id>javasourceparser</id> <phase>generate-sources</phase> <goals> <goal>exec</goal> @@ -263,9 +254,11 @@ <argument>-v</argument> <argument>-Jnorun</argument> <argument>-Jnoconstruct</argument> - <argument>-Jclass=DefaultJavaCommentParser</argument> + <argument>-Jclass=Parser</argument> + <argument>-Jimplements=CommentHandler</argument> + <argument>-Jsemantic=Value</argument> <argument>-Jpackage=com.thoughtworks.qdox.parser.impl</argument> - <argument>${basedir}/src/grammar/commentparser.y</argument> + <argument>${basedir}/src/grammar/parser.y</argument> </arguments> <workingDirectory>${project.build.directory}/generated-sources/parser/com/thoughtworks/qdox/parser/impl</workingDirectory> </configuration> @@ -334,15 +327,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <links> - <link>http://java.sun.com/j2se/1.5/docs/api</link> - </links> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.2</version> <configuration> @@ -609,7 +593,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.4</version> + <version>2.7</version> <configuration> <packagenames>com.thoughtworks.qdox.*</packagenames> <use>true</use>
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java (1136 => 1137)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java 2011-03-23 19:51:44 UTC (rev 1136) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java 2011-03-23 20:11:58 UTC (rev 1137) @@ -446,7 +446,7 @@ } public void testSourcePropertyClass() throws IOException { - builder.addSource(new File("src/test/com/thoughtworks/qdox/testdata/PropertyClass.java")); + builder.addSource(new File("src/test/java/com/thoughtworks/qdox/testdata/PropertyClass.java")); JavaClass propertyClass = builder.getClassByName("com.thoughtworks.qdox.testdata.PropertyClass"); assertEquals(1, propertyClass.getBeanProperties().size()); @@ -504,7 +504,7 @@ } public void testSourceDefaultCtor() throws Exception { - builder.addSource(new File("src/test/com/thoughtworks/qdox/testdata/DefaultCtor.java")); + builder.addSource(new File("src/test/java/com/thoughtworks/qdox/testdata/DefaultCtor.java")); JavaClass javaClass = builder.getClassByName("com.thoughtworks.qdox.testdata.DefaultCtor"); JavaMethod ctor = javaClass.getMethodBySignature("DefaultCtor", null);
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java (1136 => 1137)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-03-23 19:51:44 UTC (rev 1136) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-03-23 20:11:58 UTC (rev 1137) @@ -447,7 +447,7 @@ } public void testSourcePropertyClass() throws IOException { - builder.addSource(new File("src/test/com/thoughtworks/qdox/testdata/PropertyClass.java")); + builder.addSource(new File("src/test/java/com/thoughtworks/qdox/testdata/PropertyClass.java")); JavaClass propertyClass = builder.getClassByName("com.thoughtworks.qdox.testdata.PropertyClass"); assertEquals(1, propertyClass.getBeanProperties().size()); @@ -505,7 +505,7 @@ } public void testSourceDefaultCtor() throws Exception { - builder.addSource(new File("src/test/com/thoughtworks/qdox/testdata/DefaultCtor.java")); + builder.addSource(new File("src/test/java/com/thoughtworks/qdox/testdata/DefaultCtor.java")); JavaClass javaClass = builder.getClassByName("com.thoughtworks.qdox.testdata.DefaultCtor"); JavaMethod ctor = javaClass.getMethodBySignature("DefaultCtor", null);
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/parser/LexerTest.java (1136 => 1137)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/parser/LexerTest.java 2011-03-23 19:51:44 UTC (rev 1136) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/parser/LexerTest.java 2011-03-23 20:11:58 UTC (rev 1137) @@ -155,7 +155,7 @@ } public void testUnicodeInFile() throws Exception { - Lexer lexer = new JFlexLexer(new FileReader("src/test/com/thoughtworks/qdox/testdata/Unicode.java")); + Lexer lexer = new JFlexLexer(new FileReader("src/test/java/com/thoughtworks/qdox/testdata/Unicode.java")); assertLex(Parser.PACKAGE, lexer); assertLex(Parser.IDENTIFIER, lexer); assertLex(Parser.DOT, lexer);
To unsubscribe from this list please visit:
