Author: matzew
Date: Fri Jul 28 10:57:15 2006
New Revision: 426619
URL: http://svn.apache.org/viewvc?rev=426619&view=rev
Log:
make adf-faces-config => trinidad-config
Added:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/trinidad-config.xsd
- copied, changed from r426385,
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/adf-faces-config.xsd
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-config.xml
- copied unchanged from r426385,
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-demo/src/main/webapp/WEB-INF/adf-faces-config.xml
Removed:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/adf-faces-config.xsd
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-demo/src/main/webapp/WEB-INF/adf-faces-config.xml
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/DateTime.xml
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java?rev=426619&r1=426618&r2=426619&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
Fri Jul 28 10:57:15 2006
@@ -59,9 +59,9 @@
* If dateStyle is not set, then <code>dateStyle</code> defaults to
* <code>shortish</code>.
*
- * <p>Timezone can be set per web-app in adf-faces-config.xml configuration
file.
+ * <p>Timezone can be set per web-app in trinidad-config.xml configuration
file.
* If <code>timeZone</code> is not set on the converter, then timezone will be
defaulted to the
- * value set in adf-faces-config.xml configuration file. If it is not set in
the
+ * value set in trinidad-config.xml configuration file. If it is not set in the
* configuration file, then it will be defaulted to GMT.</p>
*
* <p>The converter always allows a level of <code>leniency</code> while
converting
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java?rev=426619&r1=426618&r2=426619&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
Fri Jul 28 10:57:15 2006
@@ -50,16 +50,16 @@
* ConverterException.
*
* If <code>number grouping separator, decimal separator</code>
- * is configured in <code>adf-faces-config.xml</code> file,
+ * is configured in <code>trinidad-config.xml</code> file,
* it will be used during call to <code>getAsObject()</code> and
* <code>getAsString()</code> for parsing and formatting. If it has not been
set,
* <code>number grouping separator, decimal separator</code> is
* defaulted based on the locale.</p>
*
* <p>If <code>currencyCode</code> is set on the converter then it will be
used.
- * Else uses the <code>currencyCode</code> set on
<code>adf-faces-config.xml</code>
+ * Else uses the <code>currencyCode</code> set on
<code>trinidad-config.xml</code>
* file. If it is not set, then it is defaulted based on the locale. The
- * value registered in adf-faces-config.xml is obtained using
+ * value registered in trinidad-config.xml is obtained using
* api from [EMAIL PROTECTED]
org.apache.myfaces.trinidad.context.RequestContext}.</p>
*
* <p>Since ADF Faces is compatible only with JDK 1.4 and higher versions,
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java?rev=426619&r1=426618&r2=426619&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
Fri Jul 28 10:57:15 2006
@@ -25,7 +25,7 @@
* It is accessible from the [EMAIL PROTECTED]
org.apache.myfaces.trinidad.context.RequestContext},
* but will be invoked automatically by the framework as needed. Developers
* can replace the standard processor using the
- * <code>adf-faces-config.xml</code> file.
+ * <code>trinidad-config.xml</code> file.
* <p>
* To configure file uploads, the default instance supports three context
* initialization parameters :
Copied:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/trinidad-config.xsd
(from r426385,
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/adf-faces-config.xsd)
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/trinidad-config.xsd?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/trinidad-config.xsd&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/adf-faces-config.xsd&r1=426385&r2=426619&rev=426619&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/adf-faces-config.xsd
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-api/src/main/resources/trinidad-config.xsd
Fri Jul 28 10:57:15 2006
@@ -28,7 +28,7 @@
<annotation>
<documentation>
The adf-faces-config element is the root element of all
- adf-faces-config.xml files.
+ trinidad-config.xml files.
</documentation>
</annotation>
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/DateTime.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/DateTime.xml?rev=426619&r1=426618&r2=426619&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/DateTime.xml
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/DateTime.xml
Fri Jul 28 10:57:15 2006
@@ -195,7 +195,7 @@
<property>
<description><![CDATA[Time zone in which to interpret any time
information in the date
string. If not set here, picks this value from
- adf-faces-config.xml configuration file. If not defined there,
then
+ trinidad-config.xml configuration file. If not defined there,
then
it is defaulted to GMT.]]>
</description>
<property-name>timeZone</property-name>
@@ -233,9 +233,9 @@
if it was not set.
</html:p>
- <html:p>Timezone can be set per web-app in adf-faces-config.xml
configuration file.
+ <html:p>Timezone can be set per web-app in trinidad-config.xml
configuration file.
If <code>timeZone</code> is not set on the converter, then timezone
will be defaulted to the
- value set in adf-faces-config.xml configuration file. If it is not
set in the
+ value set in trinidad-config.xml configuration file. If it is not
set in the
configuration file, then it will be defaulted to GMT.</html:p>
<html:p>
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml?rev=426619&r1=426618&r2=426619&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml
Fri Jul 28 10:57:15 2006
@@ -25,9 +25,9 @@
<converter-class>org.apache.myfaces.trinidadinternal.convert.NumberConverter</converter-class>
<property>
<description><![CDATA[The ISO 4217 currency code, applied only when
formatting currencies.
- Currency code can also be set for the entire application in
adf-faces-config.xml file.
+ Currency code can also be set for the entire application in
trinidad-config.xml file.
If currency code is not set on the converter, and if set on
- adf-faces-config.xml configuration file it will be used by calling
+ trinidad-config.xml configuration file it will be used by calling
<code>RequestContext().getCurrenctInstance().getCurrencyCode().</code>
This currency code will be used during call to getAsString() for
formatting,
provided type is set to 'currency'.]]>
@@ -246,14 +246,14 @@
result in a conversion failure and would throw a
ConverterException.</html:p>
<html:p>If <html:code>number grouping separator, decimal
separator</html:code>
- is configured in <html:code>adf-faces-config.xml</html:code> file,
+ is configured in <html:code>trinidad-config.xml</html:code> file,
it will be used during call to <html:code>getAsObject()</html:code>
and
<html:code>getAsString()</html:code> for parsing and formatting. If
it has not been set,
<html:code>number grouping separator, decimal separator</html:code>
is
defaulted based on the locale.</html:p>
<html:p>If <html:code>currencyCode</html:code> is set on the
converter then it will be used.
- Else uses the <html:code>currencyCode</html:code> set in
<html:code>adf-faces-config.xml</html:code>
+ Else uses the <html:code>currencyCode</html:code> set in
<html:code>trinidad-config.xml</html:code>
file. If it is not set in the configuration file then it is
defaulted based on the locale.</html:p>
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java?rev=426619&r1=426618&r2=426619&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java
Fri Jul 28 10:57:15 2006
@@ -69,7 +69,7 @@
/**
* Returns the name of the skin "family" for this skin.
* The family name is used when specifying a preferred skin
- * in adf-faces-config.xml.
+ * in trinidad-config.xml.
* This provides a way to refer to a group of
* related skin implementations while allowing the
* particular skin instance to be selected based on the
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java?rev=426619&r1=426618&r2=426619&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
Fri Jul 28 10:57:15 2006
@@ -71,7 +71,7 @@
* desktop renderkit and a Skin that makes your pages
* look purple for the pda renderkit.
* You can set the skin-family to "purple" in
- * adf-faces-config.xml, and the Skin with skin-family
+ * trinidad-config.xml, and the Skin with skin-family
* and render-kit-id match will be chosen.
* Must be non-null.
* @param renderKitId The render-kit-id that this Skin is designed for.
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java?rev=426619&r1=426618&r2=426619&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-af-skinning/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java
Fri Jul 28 10:57:15 2006
@@ -255,6 +255,6 @@
private ServletContext _context;
}
- static private final String _CONFIG_FILE = "/WEB-INF/adf-faces-config.xml";
+ static private final String _CONFIG_FILE = "/WEB-INF/trinidad-config.xml";
static private final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(ConfigParser.class);
}
