You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/06/17 20:56:27 UTC
svn commit: r668796 - in
/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test:
java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/
resources/builder/generation/ resources/builder/generation/testpkg/
Author: skitching
Date: Tue Jun 17 11:56:26 2008
New Revision: 668796
URL: http://svn.apache.org/viewvc?rev=668796&view=rev
Log:
Fix two unit test errors: the input classes for the test were not in a correctly structured directory.
As a result, the (correct) code in QdoxModelBuilder was failing to detect that java files already exist
(it was looking in the correct package subdir, but the original input java files were not in a subdir).
This caused <generatedClass>true</generatedClass> to be incorrectly set in the output xml files. But
invalid "goodfile" files were checked in that "expected" the incorrect output.
Added:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentBase.java
- copied, changed from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentBase.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenSubclass.java
- copied, changed from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenSubclass.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenTemplate.java
- copied, changed from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenTemplate.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentInterface.java
- copied, changed from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentInterface.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentManual.java
- copied, changed from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentManual.java
Removed:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentBase.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenSubclass.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenTemplate.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentInterface.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentManual.java
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile-flat.xml
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile.xml
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java?rev=668796&r1=668795&r2=668796&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java Tue Jun 17 11:56:26 2008
@@ -157,11 +157,12 @@
ClassLoader classLoader = this.getClass().getClassLoader();
URL sourceUrl = classLoader
- .getResource("builder/generation/ComponentBase.java");
+ .getResource("builder/generation/testpkg/ComponentBase.java");
String parentDirName = new File(sourceUrl.getFile()).getParent();
File parentDir = new File(parentDirName);
+ File baseDir = parentDir.getParentFile();
List sourceDirs = new ArrayList();
- sourceDirs.add(parentDir.getAbsolutePath());
+ sourceDirs.add(baseDir.getAbsolutePath());
Model model = new Model();
builder.buildModel(model, sourceDirs);
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile-flat.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile-flat.xml?rev=668796&r1=668795&r2=668796&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile-flat.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile-flat.xml Tue Jun 17 11:56:26 2008
@@ -2,8 +2,8 @@
<model>
<component>
- <className>ComponentBase</className>
- <classSource>ComponentBase</classSource>
+ <className>testpkg.ComponentBase</className>
+ <classSource>testpkg.ComponentBase</classSource>
<type>base</type>
<family>base</family>
<rendererType>BaseRenderer</rendererType>
@@ -30,8 +30,8 @@
</property>
</component>
<component>
- <className>ComponentInterface</className>
- <classSource>ComponentInterface</classSource>
+ <className>testpkg.ComponentInterface</className>
+ <classSource>testpkg.ComponentInterface</classSource>
<type>iface</type>
<family>iface</family>
<rendererType>BaseRenderer</rendererType>
@@ -57,11 +57,11 @@
</property>
</component>
<component>
- <className>ComponentChild</className>
- <parentClassName>ComponentBase</parentClassName>
- <classSource>ComponentChild</classSource>
+ <className>testpkg.ComponentChild</className>
+ <parentClassName>testpkg.ComponentBase</parentClassName>
+ <classSource>testpkg.ComponentChild</classSource>
<interfaces>
- <interface name="ComponentInterface"/>
+ <interface name="testpkg.ComponentInterface"/>
</interfaces>
<name>foo</name>
<type>foo</type>
@@ -115,30 +115,4 @@
<inherited>true</inherited>
</property>
</component>
- <converter>
- <className>Converter1</className>
- <classSource>Converter1</classSource>
- <converterId>conv1</converterId>
- <desc>The Converter1 converter</desc>
- <longDesc>
-<![CDATA[
-The Converter1 converter.
-<p>
-This is a silly converter. It does nothing useful.
-]]>
- </longDesc>
- </converter>
- <validator>
- <className>Validator1</className>
- <classSource>Validator1</classSource>
- <validatorId>val1</validatorId>
- <desc>The Validator1 validator</desc>
- <longDesc>
-<![CDATA[
-The Validator1 validator.
-<p>
-This is a silly validator. It does nothing useful.
-]]>
- </longDesc>
- </validator>
</model>
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile.xml?rev=668796&r1=668795&r2=668796&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/goodfile.xml Tue Jun 17 11:56:26 2008
@@ -2,8 +2,8 @@
<model>
<component>
- <className>generation.ComponentBase</className>
- <classSource>generation.ComponentBase</classSource>
+ <className>testpkg.ComponentBase</className>
+ <classSource>testpkg.ComponentBase</classSource>
<type>base</type>
<family>base</family>
<rendererType>BaseRenderer</rendererType>
@@ -15,7 +15,6 @@
This is a base component. It has no name, so is not a concrete component.
]]>
</longDesc>
- <generatedComponentClass>true</generatedComponentClass>
<property>
<name>prop1</name>
<className>java.lang.String</className>
@@ -31,8 +30,8 @@
</property>
</component>
<component>
- <className>generation.ComponentInterface</className>
- <classSource>generation.ComponentInterface</classSource>
+ <className>testpkg.ComponentInterface</className>
+ <classSource>testpkg.ComponentInterface</classSource>
<type>iface</type>
<family>iface</family>
<rendererType>BaseRenderer</rendererType>
@@ -44,7 +43,6 @@
This is an interface component.
]]>
</longDesc>
- <generatedComponentClass>true</generatedComponentClass>
<property>
<name>ifaceProp</name>
<className>java.lang.String</className>
@@ -59,12 +57,12 @@
</property>
</component>
<component>
- <className>generation.SubclassComponent</className>
- <parentClassName>generation.ComponentBase</parentClassName>
- <classSource>generation.ComponentGenSubclass</classSource>
- <superClassName>generation.ComponentGenSubclass</superClassName>
+ <className>testpkg.SubclassComponent</className>
+ <parentClassName>testpkg.ComponentBase</parentClassName>
+ <classSource>testpkg.ComponentGenSubclass</classSource>
+ <superClassName>testpkg.ComponentGenSubclass</superClassName>
<interfaces>
- <interface name="generation.ComponentInterface"/>
+ <interface name="testpkg.ComponentInterface"/>
</interfaces>
<name>fooFromSubclass</name>
<type>foo</type>
@@ -75,11 +73,11 @@
<generatedComponentClass>true</generatedComponentClass>
</component>
<component>
- <className>generation.TemplateComponent</className>
- <parentClassName>generation.ComponentBase</parentClassName>
- <classSource>generation.ComponentGenTemplate</classSource>
+ <className>testpkg.TemplateComponent</className>
+ <parentClassName>testpkg.ComponentBase</parentClassName>
+ <classSource>testpkg.ComponentGenTemplate</classSource>
<interfaces>
- <interface name="generation.ComponentInterface"/>
+ <interface name="testpkg.ComponentInterface"/>
</interfaces>
<name>fooFromTemplate</name>
<type>foo</type>
@@ -103,11 +101,11 @@
</property>
</component>
<component>
- <className>generation.ComponentManual</className>
- <parentClassName>generation.ComponentBase</parentClassName>
- <classSource>generation.ComponentManual</classSource>
+ <className>testpkg.ComponentManual</className>
+ <parentClassName>testpkg.ComponentBase</parentClassName>
+ <classSource>testpkg.ComponentManual</classSource>
<interfaces>
- <interface name="generation.ComponentInterface"/>
+ <interface name="testpkg.ComponentInterface"/>
</interfaces>
<name>foo</name>
<type>foo</type>
@@ -115,7 +113,6 @@
<rendererType>FooRenderer</rendererType>
<desc>A concrete component class that has been written by hand (no code generation)</desc>
<longDesc>A concrete component class that has been written by hand (no code generation).</longDesc>
- <generatedComponentClass>true</generatedComponentClass>
<property>
<name>prop2</name>
<className>boolean</className>
Copied: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentBase.java (from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentBase.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentBase.java?p2=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentBase.java&p1=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentBase.java&r1=668785&r2=668796&rev=668796&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentBase.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentBase.java Tue Jun 17 11:56:26 2008
@@ -1,4 +1,4 @@
-package generation;
+package testpkg;
/**
* A base component class.
Copied: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenSubclass.java (from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenSubclass.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenSubclass.java?p2=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenSubclass.java&p1=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenSubclass.java&r1=668785&r2=668796&rev=668796&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenSubclass.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenSubclass.java Tue Jun 17 11:56:26 2008
@@ -1,4 +1,4 @@
-package generation;
+package testpkg;
/**
* A class for which a concrete component will be created using "subclass mode" code-generation.
@@ -8,7 +8,7 @@
* type="foo"
* family="foo"
* defaultRendererType="FooRenderer"
- * class="generation.SubclassComponent"
+ * class="testpkg.SubclassComponent"
*/
public abstract class ComponentGenSubclass extends ComponentBase implements ComponentInterface
{
Copied: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenTemplate.java (from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenTemplate.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenTemplate.java?p2=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenTemplate.java&p1=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenTemplate.java&r1=668785&r2=668796&rev=668796&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentGenTemplate.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentGenTemplate.java Tue Jun 17 11:56:26 2008
@@ -1,4 +1,4 @@
-package generation;
+package testpkg;
/**
* A class for which a concrete component will be created using "template mode" code-generation.
@@ -8,7 +8,7 @@
* type="foo"
* family="foo"
* defaultRendererType="FooRenderer"
- * class="generation.TemplateComponent"
+ * class="testpkg.TemplateComponent"
* template="true"
*/
abstract class ComponentGenTemplate extends ComponentBase implements ComponentInterface
Copied: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentInterface.java (from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentInterface.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentInterface.java?p2=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentInterface.java&p1=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentInterface.java&r1=668785&r2=668796&rev=668796&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentInterface.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentInterface.java Tue Jun 17 11:56:26 2008
@@ -1,4 +1,4 @@
-package generation;
+package testpkg;
/**
* An interface that defines component properties.
Copied: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentManual.java (from r668785, myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentManual.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentManual.java?p2=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentManual.java&p1=myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentManual.java&r1=668785&r2=668796&rev=668796&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/ComponentManual.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/test/resources/builder/generation/testpkg/ComponentManual.java Tue Jun 17 11:56:26 2008
@@ -1,4 +1,4 @@
-package generation;
+package testpkg;
/**
* A concrete component class that has been written by hand (no code generation).