You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/25 19:06:32 UTC
svn commit: r425488 - in
/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src:
main/java/org/apache/myfaces/trinidadbuild/plugin/faces/
main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/
test/conf/META-INF...
Author: matzew
Date: Tue Jul 25 12:06:31 2006
New Revision: 425488
URL: http://svn.apache.org/viewvc?rev=425488&view=rev
Log:
changing content of maven-faces-plugin.
Added:
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/
- copied from r425445, incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java-templates/org/apache/myfaces/adf/
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/
- copied from r425445, incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/adf/
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/
- copied from r425445, incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/adf/
Removed:
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java-templates/org/apache/myfaces/adf/
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/adf/
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/adf/
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/conf/META-INF/faces-config.xml
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojoTest.java
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/Command.xml
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/ComponentBase.xml
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/TestInclude.xml
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Launch.xml
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Return.xml
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/faces-config.xml
incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testGenerate.lst
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java?rev=425488&r1=425487&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java Tue Jul 25 12:06:31 2006
@@ -410,7 +410,7 @@
imports.addAll(template.getImports());
// FacesBean is always needed to define the TYPE
- imports.add("org.apache.myfaces.adf.bean.FacesBean");
+ imports.add("org.apache.myfaces.trinidad.bean.FacesBean");
// Detect NamingContainer
if (component.isNamingContainer())
@@ -421,7 +421,7 @@
// PropertyKey only needed if there are properties
if (properties.hasNext())
{
- imports.add("org.apache.myfaces.adf.bean.PropertyKey");
+ imports.add("org.apache.myfaces.trinidad.bean.PropertyKey");
PropertyFilter resolvable = new ResolvableTypeFilter();
while (properties.hasNext())
@@ -433,7 +433,7 @@
// ComponentUtils only needed for resolvable properties
if (resolvable.accept(property))
- imports.add("org.apache.myfaces.adf.util.ComponentUtils");
+ imports.add("org.apache.myfaces.trinidad.util.ComponentUtils");
}
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java?rev=425488&r1=425487&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java Tue Jul 25 12:06:31 2006
@@ -643,7 +643,7 @@
{
imports.add("javax.faces.convert.Converter");
imports.add("javax.faces.el.ValueBinding");
- imports.add("org.apache.myfaces.adfinternal.taglib.util.TagUtils");
+ imports.add("org.apache.myfaces.trinidadinternal.taglib.util.TagUtils");
}
while (properties.hasNext())
@@ -956,7 +956,7 @@
{
imports.add("javax.faces.validator.Validator");
imports.add("javax.faces.el.ValueBinding");
- imports.add("org.apache.myfaces.adfinternal.taglib.util.TagUtils");
+ imports.add("org.apache.myfaces.trinidadinternal.taglib.util.TagUtils");
}
while (properties.hasNext())
@@ -1284,17 +1284,17 @@
properties = new FilteredIterator(properties, new TagAttributeFilter());
if (properties.hasNext())
{
- imports.add("org.apache.myfaces.adf.bean.FacesBean");
+ imports.add("org.apache.myfaces.trinidad.bean.FacesBean");
imports.add(componentFullClass);
}
// TODO: only add FacesBean import when properties exist
- imports.add("org.apache.myfaces.adf.bean.FacesBean");
+ imports.add("org.apache.myfaces.trinidad.bean.FacesBean");
// TODO: remove these imports
imports.add("javax.faces.component.UIComponent");
imports.add("javax.faces.el.ValueBinding");
- imports.add("org.apache.myfaces.adfinternal.taglib.util.VirtualAttributeUtils");
+ imports.add("org.apache.myfaces.trinidadinternal.taglib.util.VirtualAttributeUtils");
// superclassName is fully qualified if it collides
// with the generated class name and should not be
@@ -1323,7 +1323,7 @@
if (_isColorList(propertyClass, propertyClassParams))
{
imports.add("java.text.ParseException");
- imports.add("org.apache.myfaces.adfinternal.taglib.util.TagUtils");
+ imports.add("org.apache.myfaces.trinidadinternal.taglib.util.TagUtils");
}
// TODO: restore import and make reference to
@@ -1332,12 +1332,12 @@
//if (property.isMethodBinding() &&
// isStringMethodBindingReturnType(property))
//{
- // imports.add("org.apache.myfaces.adfinternal.taglib.ConstantMethodBinding");
+ // imports.add("org.apache.myfaces.trinidadinternal.taglib.ConstantMethodBinding");
//}
if (property.isVirtual())
{
- imports.add("org.apache.myfaces.adfinternal.taglib.util.VirtualAttributeUtils");
+ imports.add("org.apache.myfaces.trinidadinternal.taglib.util.VirtualAttributeUtils");
}
}
@@ -1402,7 +1402,7 @@
properties = new FilteredIterator(properties, new TagAttributeFilter());
// TODO: remove special case for UIXFormTag
if (properties.hasNext() ||
- "org.apache.myfaces.adfinternal.taglib.UIXFormTag".equals(component.getTagClass()))
+ "org.apache.myfaces.trinidadinternal.taglib.UIXFormTag".equals(component.getTagClass()))
{
out.println();
out.println("public void release()");
@@ -1742,7 +1742,7 @@
out.unindent();
out.println("else");
out.indent();
- out.println("mb = new org.apache.myfaces.adfinternal.taglib.ConstantMethodBinding(" + propVar + ");");
+ out.println("mb = new org.apache.myfaces.trinidadinternal.taglib.ConstantMethodBinding(" + propVar + ");");
out.unindent();
}
else
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java?rev=425488&r1=425487&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java Tue Jul 25 12:06:31 2006
@@ -987,10 +987,10 @@
static private final String _ADF_FACES_COMPONENT_BASE =
- "org.apache.myfaces.adf.component.UIXComponentBase";
+ "org.apache.myfaces.trinidad.component.UIXComponentBase";
static private final String _ADF_FACES_COMPONENT_TAG =
- "org.apache.myfaces.adf.webapp.UIXComponentTag";
+ "org.apache.myfaces.trinidad.webapp.UIXComponentTag";
static private final Logger _LOG = Logger.getLogger(ComponentBean.class.getName());
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java?rev=425488&r1=425487&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RendererBean.java Tue Jul 25 12:06:31 2006
@@ -171,7 +171,7 @@
{
ComponentBean component = resolveComponentType();
return (component != null) ? component.getComponentClass()
- : "org.apache.myfaces.adf.component.UIXComponent";
+ : "org.apache.myfaces.trinidad.component.UIXComponent";
}
/**
@@ -186,7 +186,7 @@
? component.findBehavioralComponent()
: null;
return (behavioral != null) ? behavioral.getComponentClass()
- : "org.apache.myfaces.adf.component.UIXComponent";
+ : "org.apache.myfaces.trinidad.component.UIXComponent";
}
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/conf/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/conf/META-INF/faces-config.xml?rev=425488&r1=425487&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/conf/META-INF/faces-config.xml (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/conf/META-INF/faces-config.xml Tue Jul 25 12:06:31 2006
@@ -1,156 +1,156 @@
<application>
- <view-handler>org.apache.myfaces.adfinternal.application.ViewHandlerImpl</view-handler>
- <state-manager>org.apache.myfaces.adfinternal.application.StateManagerImpl</state-manager>
- <navigation-handler>org.apache.myfaces.adfinternal.application.NavigationHandlerImpl</navigation-handler>
- <variable-resolver>org.apache.myfaces.adfinternal.el.AdfFacesVariableResolver</variable-resolver>
+ <view-handler>org.apache.myfaces.trinidadinternal.application.ViewHandlerImpl</view-handler>
+ <state-manager>org.apache.myfaces.trinidadinternal.application.StateManagerImpl</state-manager>
+ <navigation-handler>org.apache.myfaces.trinidadinternal.application.NavigationHandlerImpl</navigation-handler>
+ <variable-resolver>org.apache.myfaces.trinidadinternal.el.AdfFacesVariableResolver</variable-resolver>
</application>
<lifecycle>
- <phase-listener>org.apache.myfaces.adfinternal.context.AdfFacesPhaseListener</phase-listener>
+ <phase-listener>org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener</phase-listener>
</lifecycle>
<converter>
<converter-id>javax.faces.Short</converter-id>
- <converter-class>org.apache.myfaces.adfinternal.convert.ShortConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.ShortConverter</converter-class>
</converter>
<converter>
<converter-for-class>java.lang.Short</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.ShortConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.ShortConverter</converter-class>
</converter>
<converter>
<converter-id>javax.faces.Byte</converter-id>
- <converter-class>org.apache.myfaces.adfinternal.convert.ByteConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.ByteConverter</converter-class>
</converter>
<converter>
<converter-for-class>java.lang.Byte</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.ByteConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.ByteConverter</converter-class>
</converter>
<converter>
<converter-id>javax.faces.Integer</converter-id>
- <converter-class>org.apache.myfaces.adfinternal.convert.IntegerConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.IntegerConverter</converter-class>
</converter>
<converter>
<converter-for-class>java.lang.Integer</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.IntegerConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.IntegerConverter</converter-class>
</converter>
<converter>
<converter-id>javax.faces.Long</converter-id>
- <converter-class>org.apache.myfaces.adfinternal.convert.LongConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.LongConverter</converter-class>
</converter>
<converter>
<converter-for-class>java.lang.Long</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.LongConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.LongConverter</converter-class>
</converter>
<converter>
<converter-id>javax.faces.Float</converter-id>
- <converter-class>org.apache.myfaces.adfinternal.convert.FloatConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.FloatConverter</converter-class>
</converter>
<converter>
<converter-for-class>java.lang.Float</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.FloatConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.FloatConverter</converter-class>
</converter>
<converter>
<converter-id>javax.faces.Double</converter-id>
- <converter-class>org.apache.myfaces.adfinternal.convert.DoubleConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.DoubleConverter</converter-class>
</converter>
<converter>
<converter-for-class>java.lang.Double</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.DoubleConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.DoubleConverter</converter-class>
</converter>
<validator>
<validator-id>javax.faces.LongRange</validator-id>
- <validator-class>org.apache.myfaces.adfinternal.validator.LongRangeValidator</validator-class>
+ <validator-class>org.apache.myfaces.trinidadinternal.validator.LongRangeValidator</validator-class>
</validator>
<validator>
<display-name>validateDateTimeRange</display-name>
- <validator-id>org.apache.myfaces.adf.DateTimeRange</validator-id>
- <validator-class>org.apache.myfaces.adf.validator.DateTimeRangeValidator</validator-class>
+ <validator-id>org.apache.myfaces.trinidad.DateTimeRange</validator-id>
+ <validator-class>org.apache.myfaces.trinidad.validator.DateTimeRangeValidator</validator-class>
</validator>
<validator>
<display-name>validateRegularExpression</display-name>
- <validator-id>org.apache.myfaces.adf.RegExp</validator-id>
- <validator-class>org.apache.myfaces.adfinternal.validator.RegExpValidator</validator-class>
+ <validator-id>org.apache.myfaces.trinidad.RegExp</validator-id>
+ <validator-class>org.apache.myfaces.trinidadinternal.validator.RegExpValidator</validator-class>
</validator>
<validator>
<display-name>validateByteLength</display-name>
- <validator-id>org.apache.myfaces.adf.ByteLength</validator-id>
- <validator-class>org.apache.myfaces.adfinternal.validator.ByteLengthValidator</validator-class>
+ <validator-id>org.apache.myfaces.trinidad.ByteLength</validator-id>
+ <validator-class>org.apache.myfaces.trinidadinternal.validator.ByteLengthValidator</validator-class>
</validator>
<converter>
<display-name>Color Converter</display-name>
- <converter-id>org.apache.myfaces.adf.Color</converter-id>
- <converter-class>org.apache.myfaces.adfinternal.convert.ColorConverter</converter-class>
+ <converter-id>org.apache.myfaces.trinidad.Color</converter-id>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.ColorConverter</converter-class>
</converter>
<converter>
<description>Color Converter</description>
<converter-for-class>java.awt.Color</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.ColorConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.ColorConverter</converter-class>
</converter>
<converter>
<display-name>Date Time Converter</display-name>
<converter-id>javax.faces.DateTime</converter-id>
- <converter-class>org.apache.myfaces.adfinternal.convert.DateTimeConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.DateTimeConverter</converter-class>
</converter>
<converter>
<display-name>Date Time Converter</display-name>
- <converter-id>org.apache.myfaces.adf.DateTime</converter-id>
- <converter-class>org.apache.myfaces.adfinternal.convert.DateTimeConverter</converter-class>
+ <converter-id>org.apache.myfaces.trinidad.DateTime</converter-id>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.DateTimeConverter</converter-class>
</converter>
<converter>
<display-name>Date Time Converter</display-name>
<converter-for-class>java.util.Date</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.DateTimeConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.DateTimeConverter</converter-class>
</converter>
<converter>
<display-name>Date Time Converter</display-name>
<converter-for-class>java.sql.Timestamp</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.TimestampConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.TimestampConverter</converter-class>
</converter>
<converter>
<display-name>Date Time Converter</display-name>
<converter-for-class>java.sql.Date</converter-for-class>
- <converter-class>org.apache.myfaces.adfinternal.convert.JavaSqlDateConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidadinternal.convert.JavaSqlDateConverter</converter-class>
</converter>
<converter>
<display-name>Number Converter</display-name>
<converter-for-class>java.lang.Number</converter-for-class>
- <converter-class>org.apache.myfaces.adf.convert.NumberConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidad.convert.NumberConverter</converter-class>
</converter>
<converter>
<display-name>Number Converter</display-name>
<converter-id>javax.faces.Number</converter-id>
- <converter-class>org.apache.myfaces.adf.convert.NumberConverter</converter-class>
+ <converter-class>org.apache.myfaces.trinidad.convert.NumberConverter</converter-class>
</converter>
<converter>
<display-name>Number Converter</display-name>
- <converter-id>org.apache.myfaces.adf.Number</converter-id>
- <converter-class>org.apache.myfaces.adf.convert.NumberConverter</converter-class>
+ <converter-id>org.apache.myfaces.trinidad.Number</converter-id>
+ <converter-class>org.apache.myfaces.trinidad.convert.NumberConverter</converter-class>
</converter>
<referenced-bean>
<description>implicit object provided by ADF Faces</description>
<display-name>ADF Faces Context</display-name>
<referenced-bean-name>adfFacesContext</referenced-bean-name>
- <referenced-bean-class>org.apache.myfaces.adf.context.AdfFacesContext</referenced-bean-class>
+ <referenced-bean-class>org.apache.myfaces.trinidad.context.AdfFacesContext</referenced-bean-class>
</referenced-bean>
<referenced-bean>
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java?rev=425488&r1=425445&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java Tue Jul 25 12:06:31 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.adf.component;
+package org.apache.myfaces.trinidad.component;
import javax.faces.component.ActionSource;
import javax.faces.context.FacesContext;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojoTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojoTest.java?rev=425488&r1=425487&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojoTest.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojoTest.java Tue Jul 25 12:06:31 2006
@@ -85,11 +85,11 @@
_mojo.execute();
File targetFile = new File(_genSrcDir,
- "org/apache/myfaces/adf/component/UIXCommand.java");
+ "org/apache/myfaces/trinidad/component/UIXCommand.java");
if (!targetFile.exists())
fail("Component not generated");
- // TODO: verify identity content with ADF Faces example
+ // TODO: verify identity content with trinidad Faces example
}
public void testGenerateWithTemplate() throws MojoExecutionException, MojoFailureException
@@ -99,11 +99,11 @@
_mojo.execute();
File targetFile = new File(_genSrcDir,
- "org/apache/myfaces/adf/component/UIXCommand.java");
+ "org/apache/myfaces/trinidad/component/UIXCommand.java");
if (!targetFile.exists())
fail("Component not generated");
- // TODO: verify identity content with ADF Faces example
+ // TODO: verify identity content with trinidad Faces example
}
private Mojo _mojo;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/Command.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/Command.xml?rev=425488&r1=425445&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/Command.xml (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/Command.xml Tue Jul 25 12:06:31 2006
@@ -15,15 +15,15 @@
limitations under the License.
-->
<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:af="http://myfaces.apache.org/adf/faces/core"
+ xmlns:af="http://myfaces.apache.org/trinidad"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:md="http://myfaces.apache.org/bali/xml/metadata"
xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin" >
<component>
- <component-type>org.apache.myfaces.adf.Command</component-type>
- <component-class>org.apache.myfaces.adf.component.UIXCommand</component-class>
+ <component-type>org.apache.myfaces.trinidad.Command</component-type>
+ <component-class>org.apache.myfaces.trinidad.component.UIXCommand</component-class>
<description>
A base abstraction for components that implement ActionSource.
@@ -85,7 +85,7 @@
<property-extension>
<mfp:state-holder>true</mfp:state-holder>
<mfp:method-binding-signature>
- <mfp:parameter-type>org.apache.myfaces.adf.event.ReturnEvent</mfp:parameter-type>
+ <mfp:parameter-type>org.apache.myfaces.trinidad.event.ReturnEvent</mfp:parameter-type>
<mfp:return-type>void</mfp:return-type>
</mfp:method-binding-signature>
</property-extension>
@@ -108,11 +108,11 @@
</property>
<component-extension>
- <mfp:component-family>org.apache.myfaces.adf.Command</mfp:component-family>
- <mfp:default-renderer-type>org.apache.myfaces.adf.Button</mfp:default-renderer-type>
- <mfp:component-supertype>org.apache.myfaces.adf.ComponentBase</mfp:component-supertype>
+ <mfp:component-family>org.apache.myfaces.trinidad.Command</mfp:component-family>
+ <mfp:default-renderer-type>org.apache.myfaces.trinidad.Button</mfp:default-renderer-type>
+ <mfp:component-supertype>org.apache.myfaces.trinidad.ComponentBase</mfp:component-supertype>
- <mfp:jsp-tag-class>org.apache.myfaces.adfinternal.taglib.UIXCommandTag</mfp:jsp-tag-class>
+ <mfp:jsp-tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXCommandTag</mfp:jsp-tag-class>
<mfp:jsp-tag-name>af:command</mfp:jsp-tag-name>
<mfp:event>
@@ -121,12 +121,12 @@
</mfp:event>
<mfp:event>
- <mfp:event-type>org.apache.myfaces.adf.Launch</mfp:event-type>
+ <mfp:event-type>org.apache.myfaces.trinidad.Launch</mfp:event-type>
<mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
</mfp:event>
<mfp:event>
- <mfp:event-type>org.apache.myfaces.adf.Return</mfp:event-type>
+ <mfp:event-type>org.apache.myfaces.trinidad.Return</mfp:event-type>
<mfp:event-delivery-phases>Apply Request Values</mfp:event-delivery-phases>
</mfp:event>
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/ComponentBase.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/ComponentBase.xml?rev=425488&r1=425445&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/ComponentBase.xml (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/ComponentBase.xml Tue Jul 25 12:06:31 2006
@@ -20,8 +20,8 @@
<component>
- <component-type>org.apache.myfaces.adf.ComponentBase</component-type>
- <component-class>org.apache.myfaces.adf.component.UIXComponentBase</component-class>
+ <component-type>org.apache.myfaces.trinidad.ComponentBase</component-type>
+ <component-class>org.apache.myfaces.trinidad.component.UIXComponentBase</component-class>
<property>
<property-name>attributeChangeListener</property-name>
@@ -35,7 +35,7 @@
<property-extension>
<mfp:state-holder>true</mfp:state-holder>
<mfp:method-binding-signature>
- <mfp:parameter-type>org.apache.myfaces.adf.event.AttributeChangeEvent</mfp:parameter-type>
+ <mfp:parameter-type>org.apache.myfaces.trinidad.event.AttributeChangeEvent</mfp:parameter-type>
<mfp:return-type>void</mfp:return-type>
</mfp:method-binding-signature>
</property-extension>
@@ -44,9 +44,9 @@
<component-extension>
<mfp:component-supertype>javax.faces.Component</mfp:component-supertype>
- <mfp:jsp-tag-class>org.apache.myfaces.adfinternal.taglib.UIXComponentTag</mfp:jsp-tag-class>
+ <mfp:jsp-tag-class>org.apache.myfaces.trinidadinternal.taglib.UIXComponentTag</mfp:jsp-tag-class>
<mfp:event>
- <mfp:event-type>org.apache.myfaces.adf.AttributeChange</mfp:event-type>
+ <mfp:event-type>org.apache.myfaces.trinidad.AttributeChange</mfp:event-type>
<mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
</mfp:event>
</component-extension>
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/TestInclude.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/TestInclude.xml?rev=425488&r1=425445&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/TestInclude.xml (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/TestInclude.xml Tue Jul 25 12:06:31 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:af="http://myfaces.apache.org/adf/faces/core"
+ xmlns:af="http://myfaces.apache.org/trinidad"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:md="http://myfaces.apache.org/bali/xml/metadata"
xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin" >
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Launch.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Launch.xml?rev=425488&r1=425445&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Launch.xml (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Launch.xml Tue Jul 25 12:06:31 2006
@@ -22,10 +22,10 @@
<mfp:description>
Event delivered to prompt the command to launch a dialog.
</mfp:description>
- <mfp:event-type>org.apache.myfaces.adf.Launch</mfp:event-type>
- <mfp:event-class>org.apache.myfaces.adf.event.LaunchEvent</mfp:event-class>
- <mfp:event-listener-class>org.apache.myfaces.adf.event.LaunchListener</mfp:event-listener-class>
- <mfp:event-source-interface>org.apache.myfaces.adf.component.DialogSource</mfp:event-source-interface>
+ <mfp:event-type>org.apache.myfaces.trinidad.Launch</mfp:event-type>
+ <mfp:event-class>org.apache.myfaces.trinidad.event.LaunchEvent</mfp:event-class>
+ <mfp:event-listener-class>org.apache.myfaces.trinidad.event.LaunchListener</mfp:event-listener-class>
+ <mfp:event-source-interface>org.apache.myfaces.trinidad.component.DialogSource</mfp:event-source-interface>
<mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
</mfp:event>
</faces-config-extension>
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Return.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Return.xml?rev=425488&r1=425445&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Return.xml (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Return.xml Tue Jul 25 12:06:31 2006
@@ -22,10 +22,10 @@
<mfp:description>
Event delivered when the dialog has completed successfully.
</mfp:description>
- <mfp:event-type>org.apache.myfaces.adf.Return</mfp:event-type>
- <mfp:event-class>org.apache.myfaces.adf.event.ReturnEvent</mfp:event-class>
- <mfp:event-listener-class>org.apache.myfaces.adf.event.ReturnListener</mfp:event-listener-class>
- <mfp:event-source-interface>org.apache.myfaces.adf.component.DialogSource</mfp:event-source-interface>
+ <mfp:event-type>org.apache.myfaces.trinidad.Return</mfp:event-type>
+ <mfp:event-class>org.apache.myfaces.trinidad.event.ReturnEvent</mfp:event-class>
+ <mfp:event-listener-class>org.apache.myfaces.trinidad.event.ReturnListener</mfp:event-listener-class>
+ <mfp:event-source-interface>org.apache.myfaces.trinidad.component.DialogSource</mfp:event-source-interface>
<mfp:event-delivery-phases>Apply Request Values</mfp:event-delivery-phases>
</mfp:event>
</faces-config-extension>
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/faces-config.xml?rev=425488&r1=425487&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/faces-config.xml (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/faces-config.xml Tue Jul 25 12:06:31 2006
@@ -15,8 +15,8 @@
limitations under the License.
-->
<faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="components/adf/faces/Command.xml" xpointer="/faces-config/*"></xi:include>
+ <xi:include href="components/trinidad/faces/Command.xml" xpointer="/faces-config/*"></xi:include>
<xi:include href="events/javax/faces/Action.xml" xpointer="/faces-config/*"></xi:include>
- <xi:include href="events/adf/faces/Launch.xml" xpointer="/faces-config/*"></xi:include>
- <xi:include href="events/adf/faces/Return.xml" xpointer="/faces-config/*"></xi:include>
+ <xi:include href="events/trinidad/faces/Launch.xml" xpointer="/faces-config/*"></xi:include>
+ <xi:include href="events/trinidad/faces/Return.xml" xpointer="/faces-config/*"></xi:include>
</faces-config>
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testGenerate.lst
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testGenerate.lst?rev=425488&r1=425487&r2=425488&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testGenerate.lst (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testGenerate.lst Tue Jul 25 12:06:31 2006
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="components/adf/faces/Command.xml" xpointer="/faces-config/*"></xi:include>
+ <xi:include href="components/trinidad/faces/Command.xml" xpointer="/faces-config/*"></xi:include>
<xi:include href="events/javax/faces/Action.xml" xpointer="/faces-config/*"></xi:include>
- <xi:include href="events/adf/faces/Launch.xml" xpointer="/faces-config/*"></xi:include>
- <xi:include href="events/adf/faces/Return.xml" xpointer="/faces-config/*"></xi:include>
+ <xi:include href="events/trinidad/faces/Launch.xml" xpointer="/faces-config/*"></xi:include>
+ <xi:include href="events/trinidad/faces/Return.xml" xpointer="/faces-config/*"></xi:include>
</faces-config>