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/03/26 19:04:24 UTC
svn commit: r641447 - in
/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src:
main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/
main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/
main/java/org/apach...
Author: skitching
Date: Wed Mar 26 11:04:05 2008
New Revision: 641447
URL: http://svn.apache.org/viewvc?rev=641447&view=rev
Log:
Rename some classes in the model package. No other change.
Added:
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java
- copied, changed from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterMeta.java
- copied, changed from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java
- copied, changed from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java
- copied, changed from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererMeta.java
- copied, changed from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java
- copied, changed from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorModel.java
Removed:
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererModel.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorModel.java
Modified:
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/Model.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojoTest.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java
Modified: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java?rev=641447&r1=641446&r2=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java Wed Mar 26 11:04:05 2008
@@ -27,9 +27,9 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentModel;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyModel;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyMeta;
import org.apache.myfaces.buildtools.maven2.plugin.builder.qdox.QdoxModelBuilder;
/**
@@ -80,12 +80,12 @@
Iterator components = artifacts.components();
while (components.hasNext())
{
- dumpComponent((ComponentModel) components.next());
+ dumpComponent((ComponentMeta) components.next());
}
System.out.println("--dumped artifacts--");
}
- private void dumpComponent(ComponentModel c)
+ private void dumpComponent(ComponentMeta c)
{
PrintStream out = System.out;
out.println("==Component");
@@ -94,7 +94,7 @@
Iterator p = c.properties();
while (p.hasNext())
{
- PropertyModel prop = (PropertyModel) p.next();
+ PropertyMeta prop = (PropertyMeta) p.next();
out.println("prop:" + prop.getName());
out.println(" class:" + prop.getClassName());
out.println(" isLiteral:" + prop.isLiteralOnly());
@@ -144,7 +144,7 @@
* @param component
* the parsed component metadata
*/
- private void _generateComponent(ComponentModel component)
+ private void _generateComponent(ComponentMeta component)
throws MojoExecutionException
{
/*
Modified: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java?rev=641447&r1=641446&r2=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java Wed Mar 26 11:04:05 2008
@@ -34,7 +34,7 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentModel;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
/**
@@ -202,7 +202,7 @@
{
for (Iterator i = model.components(); i.hasNext();)
{
- ComponentModel cmp = (ComponentModel) i.next();
+ ComponentMeta cmp = (ComponentMeta) i.next();
writer.writeStartElement("component");
writer.writeCharacters("\n");
writer.writeStartElement("component-type");
Copied: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java (from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentModel.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java?p2=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java&p1=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentModel.java&r1=641441&r2=641447&rev=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentModel.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ComponentMeta.java Wed Mar 26 11:04:05 2008
@@ -28,9 +28,9 @@
/**
*/
-public class ComponentModel extends ModelItem
+public class ComponentMeta extends ModelItem
{
- static private final Logger _LOG = Logger.getLogger(ComponentModel.class
+ static private final Logger _LOG = Logger.getLogger(ComponentMeta.class
.getName());
private String _name;
@@ -52,7 +52,7 @@
/**
* Write an instance of this class out as xml.
*/
- public static void writeXml(XmlWriter out, ComponentModel cm)
+ public static void writeXml(XmlWriter out, ComponentMeta cm)
{
out.beginElement("component");
@@ -68,8 +68,8 @@
for (Iterator i = cm._properties.values().iterator(); i.hasNext();)
{
- PropertyModel prop = (PropertyModel) i.next();
- PropertyModel.writeXml(out, prop);
+ PropertyMeta prop = (PropertyMeta) i.next();
+ PropertyMeta.writeXml(out, prop);
}
out.endElement("component");
@@ -83,7 +83,7 @@
{
String newPrefix = prefix + "/component";
- digester.addObjectCreate(newPrefix, ComponentModel.class);
+ digester.addObjectCreate(newPrefix, ComponentMeta.class);
ModelItem.addXmlRules(digester, newPrefix);
@@ -94,13 +94,13 @@
digester.addBeanPropertySetter(newPrefix + "/desc", "description");
digester.addBeanPropertySetter(newPrefix + "/longDesc",
"longDescription");
- PropertyModel.addXmlRules(digester, newPrefix);
+ PropertyMeta.addXmlRules(digester, newPrefix);
}
/**
* Constructor.
*/
- public ComponentModel()
+ public ComponentMeta()
{
_properties = new LinkedHashMap();
}
@@ -346,7 +346,7 @@
* @param property
* the property to add
*/
- public void addProperty(PropertyModel property)
+ public void addProperty(PropertyMeta property)
{
_properties.put(property.getName(), property);
}
@@ -357,9 +357,9 @@
* @param propertyName
* the property name to find
*/
- public PropertyModel getProperty(String propertyName)
+ public PropertyMeta getProperty(String propertyName)
{
- return (PropertyModel) _properties.get(propertyName);
+ return (PropertyMeta) _properties.get(propertyName);
}
/**
Copied: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterMeta.java (from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterModel.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterMeta.java?p2=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterMeta.java&p1=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterModel.java&r1=641441&r2=641447&rev=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterModel.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ConverterMeta.java Wed Mar 26 11:04:05 2008
@@ -30,9 +30,9 @@
* A converter can be used in two ways: (a) referenced via its id, or (b)
* instantiated via a tag.
*/
-public class ConverterModel
+public class ConverterMeta
{
- static private final Logger _LOG = Logger.getLogger(ConverterModel.class
+ static private final Logger _LOG = Logger.getLogger(ConverterMeta.class
.getName());
private String _className;
@@ -47,7 +47,7 @@
/**
* Write an instance of this class out as xml.
*/
- public static void writeXml(XmlWriter out, ConverterModel cm)
+ public static void writeXml(XmlWriter out, ConverterMeta cm)
{
out.beginElement("converter");
@@ -69,7 +69,7 @@
{
String newPrefix = prefix + "/converter";
- digester.addObjectCreate(newPrefix, ConverterModel.class);
+ digester.addObjectCreate(newPrefix, ConverterMeta.class);
digester.addBeanPropertySetter(newPrefix + "/className");
digester.addBeanPropertySetter(newPrefix + "/converterId");
digester.addBeanPropertySetter(newPrefix + "/converterClass");
Modified: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/Model.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/Model.java?rev=641447&r1=641446&r2=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/Model.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/Model.java Wed Mar 26 11:04:05 2008
@@ -58,20 +58,20 @@
for (Iterator i = model._components.iterator(); i.hasNext();)
{
- ComponentModel c = (ComponentModel) i.next();
- ComponentModel.writeXml(out, c);
+ ComponentMeta c = (ComponentMeta) i.next();
+ ComponentMeta.writeXml(out, c);
}
for (Iterator i = model._converters.iterator(); i.hasNext();)
{
- ConverterModel c = (ConverterModel) i.next();
- ConverterModel.writeXml(out, c);
+ ConverterMeta c = (ConverterMeta) i.next();
+ ConverterMeta.writeXml(out, c);
}
for (Iterator i = model._validators.iterator(); i.hasNext();)
{
- ValidatorModel c = (ValidatorModel) i.next();
- ValidatorModel.writeXml(out, c);
+ ValidatorMeta c = (ValidatorMeta) i.next();
+ ValidatorMeta.writeXml(out, c);
}
out.endElement("model");
@@ -89,7 +89,7 @@
String prefix = "model";
digester.addObjectCreate(prefix, Model.class);
- ComponentModel.addXmlRules(digester, prefix);
+ ComponentMeta.addXmlRules(digester, prefix);
}
/**
@@ -115,22 +115,22 @@
for (Iterator i = _components.iterator(); i.hasNext();)
{
- ComponentModel comp = (ComponentModel) i.next();
+ ComponentMeta comp = (ComponentMeta) i.next();
List l = new ArrayList();
addAncestors(l, comp);
for (Iterator j = l.iterator(); j.hasNext();)
{
- ComponentModel ancestor = (ComponentModel) j.next();
+ ComponentMeta ancestor = (ComponentMeta) j.next();
copyProps(comp, ancestor);
}
}
}
- private void copyProps(ComponentModel dst, ComponentModel src)
+ private void copyProps(ComponentMeta dst, ComponentMeta src)
{
for (Iterator i = src.properties(); i.hasNext();)
{
- PropertyModel prop = (PropertyModel) i.next();
+ PropertyMeta prop = (PropertyMeta) i.next();
if (dst.getProperty(prop.getName()) == null)
{
dst.addProperty(prop);
@@ -146,12 +146,12 @@
}
}
- private void addAncestors(List l, ComponentModel comp)
+ private void addAncestors(List l, ComponentMeta comp)
{
String parentClassName = comp.getParentClassName();
if (parentClassName != null)
{
- ComponentModel parent = (ComponentModel) _componentsByClass
+ ComponentMeta parent = (ComponentMeta) _componentsByClass
.get(parentClassName);
l.add(parent);
addAncestors(l, parent);
@@ -161,7 +161,7 @@
for (Iterator i = interfaces.iterator(); i.hasNext();)
{
String ifaceName = (String) i.next();
- ComponentModel iface = (ComponentModel) _componentsByClass
+ ComponentMeta iface = (ComponentMeta) _componentsByClass
.get(ifaceName);
l.add(ifaceName);
addAncestors(l, iface);
@@ -171,7 +171,7 @@
/**
* Holds info about a JSF Converter definition
*/
- public void addConverter(ConverterModel converter)
+ public void addConverter(ConverterMeta converter)
{
_converters.add(converter);
_convertersByClass.put(converter.getClassName(), converter);
@@ -193,15 +193,15 @@
return _converters.iterator();
}
- public ConverterModel findConverterByClassName(String className)
+ public ConverterMeta findConverterByClassName(String className)
{
- return (ConverterModel) _convertersByClass.get(className);
+ return (ConverterMeta) _convertersByClass.get(className);
}
/**
* Holds info about a JSF Converter definition
*/
- public void addValidator(ValidatorModel validator)
+ public void addValidator(ValidatorMeta validator)
{
_validators.add(validator);
_validatorsByClass.put(validator.getClassName(), validator);
@@ -223,9 +223,9 @@
return _validators.iterator();
}
- public ValidatorModel findValidatorByClassName(String className)
+ public ValidatorMeta findValidatorByClassName(String className)
{
- return (ValidatorModel) _validatorsByClass.get(className);
+ return (ValidatorMeta) _validatorsByClass.get(className);
}
/**
@@ -234,7 +234,7 @@
* @param component
* the component to add
*/
- public void addComponent(ComponentModel component)
+ public void addComponent(ComponentMeta component)
{
_components.add(component);
_componentsByClass.put(component.getClassName(), component);
@@ -256,9 +256,9 @@
return _components.iterator();
}
- public ComponentModel findComponentByClassName(String className)
+ public ComponentMeta findComponentByClassName(String className)
{
- return (ComponentModel) _componentsByClass.get(className);
+ return (ComponentMeta) _componentsByClass.get(className);
}
/**
@@ -267,7 +267,7 @@
* @param renderKit
* the render kit to add
*/
- public void addRenderKit(RenderKitModel renderKit)
+ public void addRenderKit(RenderKitMeta renderKit)
{
_renderKits.add(renderKit);
_renderKitsByClass.put(renderKit.getClassName(), renderKit);
@@ -294,8 +294,8 @@
* @param renderKitId
* the render kit id to find
*/
- private RenderKitModel findRenderKitByClassName(String className)
+ private RenderKitMeta findRenderKitByClassName(String className)
{
- return (RenderKitModel) _renderKitsByClass.get(className);
+ return (RenderKitMeta) _renderKitsByClass.get(className);
}
}
Copied: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java (from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyModel.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java?p2=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java&p1=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyModel.java&r1=641441&r2=641447&rev=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyModel.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java Wed Mar 26 11:04:05 2008
@@ -23,7 +23,7 @@
/**
*/
-public class PropertyModel
+public class PropertyMeta
{
private String _name;
private String _className;
@@ -36,7 +36,7 @@
/**
* Write this model out as xml.
*/
- public static void writeXml(XmlWriter out, PropertyModel pm)
+ public static void writeXml(XmlWriter out, PropertyMeta pm)
{
out.beginElement("property");
out.writeElement("name", pm._name);
@@ -56,7 +56,7 @@
{
String newPrefix = prefix + "/property";
- digester.addObjectCreate(newPrefix, PropertyModel.class);
+ digester.addObjectCreate(newPrefix, PropertyMeta.class);
digester.addBeanPropertySetter(newPrefix + "/name");
digester.addBeanPropertySetter(newPrefix + "/className");
digester.addBeanPropertySetter(newPrefix + "/required");
Copied: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java (from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitModel.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java?p2=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java&p1=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitModel.java&r1=641441&r2=641447&rev=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitModel.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RenderKitMeta.java Wed Mar 26 11:04:05 2008
@@ -26,7 +26,7 @@
* RenderKitBean is a Java representation of the faces-config render-kit XML
* element.
*/
-public class RenderKitModel
+public class RenderKitMeta
{
private String _className;
@@ -49,7 +49,7 @@
/**
* Creates a new RenderKitBean.
*/
- public RenderKitModel()
+ public RenderKitMeta()
{
_renderers = new TreeMap();
}
@@ -81,7 +81,7 @@
* @param renderer
* the renderer to add
*/
- public void addRenderer(RendererModel renderer)
+ public void addRenderer(RendererMeta renderer)
{
String componentFamily = renderer.getComponentFamily();
String rendererType = renderer.getRendererType();
@@ -97,11 +97,11 @@
* @param rendererType
* the renderer type
*/
- public RendererModel findRenderer(String componentFamily,
+ public RendererMeta findRenderer(String componentFamily,
String rendererType)
{
String compositeKey = componentFamily + "|" + rendererType;
- return (RendererModel) _renderers.get(compositeKey);
+ return (RendererMeta) _renderers.get(compositeKey);
}
/**
@@ -124,12 +124,12 @@
return _renderers.values().iterator();
}
- void addAllRenderers(RenderKitModel renderKit)
+ void addAllRenderers(RenderKitMeta renderKit)
{
for (Iterator i = renderKit._renderers.values().iterator(); i.hasNext();)
{
// use addRenderer to establish owner
- addRenderer((RendererModel) i.next());
+ addRenderer((RendererMeta) i.next());
}
}
}
Copied: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererMeta.java (from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererModel.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererMeta.java?p2=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererMeta.java&p1=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererModel.java&r1=641441&r2=641447&rev=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererModel.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/RendererMeta.java Wed Mar 26 11:04:05 2008
@@ -23,7 +23,7 @@
/**
*/
-public class RendererModel extends ModelItem
+public class RendererMeta extends ModelItem
{
private String _description;
@@ -38,7 +38,7 @@
/**
* Creates a new RendererBean.
*/
- public RendererModel()
+ public RendererMeta()
{
_attributes = new TreeMap();
_facets = new TreeMap();
@@ -177,7 +177,7 @@
*/
public String findComponentClass()
{
- ComponentModel component = resolveComponentType();
+ ComponentMeta component = resolveComponentType();
return (component != null) ? component.getClassName()
: "org.apache.myfaces.trinidad.component.UIXComponent";
}
@@ -197,7 +197,7 @@
*
* @return the component type instance
*/
- public ComponentModel resolveComponentType()
+ public ComponentMeta resolveComponentType()
{
if (_componentType == null)
return null;
Copied: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java (from r641441, myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorModel.java)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java?p2=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java&p1=myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorModel.java&r1=641441&r2=641447&rev=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorModel.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/ValidatorMeta.java Wed Mar 26 11:04:05 2008
@@ -26,9 +26,9 @@
/**
*/
-public class ValidatorModel
+public class ValidatorMeta
{
- static private final Logger _LOG = Logger.getLogger(ValidatorModel.class
+ static private final Logger _LOG = Logger.getLogger(ValidatorMeta.class
.getName());
private String _className;
@@ -44,7 +44,7 @@
/**
* Write an instance of this class out as xml.
*/
- public static void writeXml(XmlWriter out, ValidatorModel vm)
+ public static void writeXml(XmlWriter out, ValidatorMeta vm)
{
out.beginElement("validator");
@@ -66,7 +66,7 @@
{
String newPrefix = prefix + "/validator";
- digester.addObjectCreate(newPrefix, ConverterModel.class);
+ digester.addObjectCreate(newPrefix, ConverterMeta.class);
digester.addBeanPropertySetter(newPrefix + "/className");
digester.addBeanPropertySetter(newPrefix + "/validatorId");
digester.addBeanPropertySetter(newPrefix + "/validatorClass");
Modified: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java?rev=641447&r1=641446&r2=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java Wed Mar 26 11:04:05 2008
@@ -13,12 +13,12 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.myfaces.buildtools.maven2.plugin.builder.ModelBuilder;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentModel;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ConverterModel;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ConverterMeta;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ModelItem;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyModel;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ValidatorModel;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyMeta;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ValidatorMeta;
import com.thoughtworks.qdox.JavaDocBuilder;
import com.thoughtworks.qdox.model.AbstractJavaEntity;
@@ -297,7 +297,7 @@
JavaClass parentClazz = clazz.getSuperJavaClass();
while (parentClazz != null)
{
- ComponentModel parentComponent = model
+ ComponentMeta parentComponent = model
.findComponentByClassName(parentClazz.getName());
if (parentComponent != null)
{
@@ -314,7 +314,7 @@
{
JavaClass iclazz = classes[i];
- ComponentModel ifaceComponent = model
+ ComponentMeta ifaceComponent = model
.findComponentByClassName(iclazz.getName());
if (ifaceComponent != null)
{
@@ -337,7 +337,7 @@
String converterId = getString(clazz, "id", props, null);
- ConverterModel converter = new ConverterModel();
+ ConverterMeta converter = new ConverterMeta();
converter.setClassName(clazz.getName());
converter.setConverterId(converterId);
converter.setDescription(shortDescription);
@@ -358,7 +358,7 @@
String validatorId = getString(clazz, "id", props, null);
- ValidatorModel validator = new ValidatorModel();
+ ValidatorMeta validator = new ValidatorMeta();
validator.setClassName(clazz.getName());
validator.setValidatorId(validatorId);
validator.setDescription(shortDescription);
@@ -420,7 +420,7 @@
String tagSuperclass = getString(clazz, "tagSuperclass", props, null);
String tagHandler = getString(clazz, "tagHandler", props, null);
- ComponentModel component = new ComponentModel();
+ ComponentMeta component = new ComponentMeta();
initAncestry(model, clazz, component);
component.setName(componentName);
component.setClassName(componentClass);
@@ -460,7 +460,7 @@
* component properties, and add metadata about them to the model.
*/
private void processComponentProperties(JavaClass clazz,
- ComponentModel component)
+ ComponentMeta component)
{
JavaMethod[] methods = clazz.getMethods();
for (int i = 0; i < methods.length; ++i)
@@ -486,7 +486,7 @@
}
private void processComponentProperty(Map props, AbstractJavaEntity ctx,
- JavaClass clazz, JavaMethod method, ComponentModel component)
+ JavaClass clazz, JavaMethod method, ComponentMeta component)
{
Boolean required = getBoolean(clazz, "required", props, Boolean.FALSE);
Boolean transientProp = getBoolean(clazz, "transient", props,
@@ -504,7 +504,7 @@
Type returnType = method.getReturns();
- PropertyModel p = new PropertyModel();
+ PropertyMeta p = new PropertyMeta();
p.setName(methodToPropName(method.getName()));
p.setClassName(returnType.toString());
p.setRequired(required.booleanValue());
@@ -586,7 +586,7 @@
return doc.substring(0, index);
}
- private void validateComponent(ComponentModel component)
+ private void validateComponent(ComponentMeta component)
throws MojoExecutionException
{
// when name is set, this is a real component, so must have
Modified: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojoTest.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojoTest.java?rev=641447&r1=641446&r2=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojoTest.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojoTest.java Wed Mar 26 11:04:05 2008
@@ -20,9 +20,9 @@
import junit.framework.TestCase;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentModel;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyModel;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyMeta;
/**
* Tests the faces-config.xml generation mojo.
@@ -33,7 +33,7 @@
{
Model model = new Model();
- ComponentModel comp = new ComponentModel();
+ ComponentMeta comp = new ComponentMeta();
comp.setName("mockComponent");
comp.setClassName("example.MockComponent");
comp.setDescription("dummy desc");
@@ -42,7 +42,7 @@
comp.setParentClassName("javax.faces.UIComponent");
comp.setType("mockType");
- PropertyModel prop = new PropertyModel();
+ PropertyMeta prop = new PropertyMeta();
prop.setName("mockProp");
prop.setDescription("propdesc");
prop.setLiteralOnly(true);
Modified: myfaces/myfaces-build-tools/branches/skitching/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/branches/skitching/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java?rev=641447&r1=641446&r2=641447&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilderTest.java Wed Mar 26 11:04:05 2008
@@ -34,9 +34,9 @@
import junit.framework.TestCase;
import org.apache.myfaces.buildtools.maven2.plugin.builder.IOUtils;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentModel;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyModel;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyMeta;
/**
* Tests the QDoxModelBuilderTest generation mojo.
@@ -69,10 +69,10 @@
builder.buildModel(model, sourceDirs);
assertEquals(1, model.getComponents().size());
- ComponentModel cm = (ComponentModel) model.getComponents().get(0);
+ ComponentMeta cm = (ComponentMeta) model.getComponents().get(0);
assertEquals(1, cm.propertiesSize());
Iterator props = cm.properties();
- PropertyModel prop1 = (PropertyModel) props.next();
+ PropertyMeta prop1 = (PropertyMeta) props.next();
assertEquals("prop1", prop1.getName());
assertEquals("java.lang.String", prop1.getClassName());
}