Author: matzew
Date: Thu Jul 27 17:55:02 2006
New Revision: 426345
URL: http://svn.apache.org/viewvc?rev=426345&view=rev
Log:
some skinning related stuff (config, namespace, name of file)
Added:
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml
- copied, changed from r426335,
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/adf-faces-skins.xml
Removed:
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/adf-faces-skins.xml
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/XMLConstants.java
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf.xsd
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf/lafConfig.xsd
Copied:
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml
(from r426335,
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/adf-faces-skins.xml)
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/adf-faces-skins.xml&r1=426335&r2=426345&rev=426345&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/adf-faces-skins.xml
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-demo/src/main/webapp/WEB-INF/trinidad-skins.xml
Thu Jul 27 17:55:02 2006
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<skins xmlns="http://myfaces.apache.org/adf/view/faces/skin";>
+<skins xmlns="http://myfaces.apache.org/trinidad/skin";>
<skin>
<id>
purple.desktop
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java?rev=426345&r1=426344&r2=426345&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
Thu Jul 27 17:55:02 2006
@@ -55,7 +55,7 @@
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
/**
- * Utility functions for creating Skins from the adf-faces-skins.xml file
+ * Utility functions for creating Skins from the trinidad-skins.xml file
* @version $Name: $ ($Revision:
adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/skin/SkinUtils.java#0
$) $Date: 10-nov-2005.18:59:00 $
* @author The Oracle ADF Faces Team
*/
@@ -85,12 +85,12 @@
/**
* Register any custom skin extensions found in the
- * adf-faces-skins.xml file with the SkinFactory.
+ * trinidad-skins.xml file with the SkinFactory.
*
* Make sure the SkinFactory.getFactory() does not return null before
* calling this method.
* You should call registerBaseSkins() before calling this method.
- * @param context ServletContext, used to get the adf-faces-skins.xml file.
+ * @param context ServletContext, used to get the trinidad-skins.xml file.
*/
static public void registerSkinExtensions(
ServletContext context)
@@ -310,7 +310,7 @@
}
/**
- * Parse the adf-faces-skins.xml file for SkinExtensions and add each
+ * Parse the trinidad-skins.xml file for SkinExtensions and add each
* SkinExtension to the skinFactory.
* @param context
* @param skinFactory
@@ -322,7 +322,7 @@
if (context == null)
return;
- // =-=jmw @todo find adf-faces-skins.xml in jar
+ // =-=jmw @todo find trinidad-skins.xml in jar
InputStream in = context.getResourceAsStream(_CONFIG_FILE);
if (in != null)
{
@@ -377,7 +377,7 @@
// Property for storing/retrieving the SkinFactory
static private final String _SKIN_FACTORY_PROPERTY = "_skinFactory";
- static private final String _CONFIG_FILE = "/WEB-INF/adf-faces-skins.xml";
+ static private final String _CONFIG_FILE = "/WEB-INF/trinidad-skins.xml";
static private final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(SkinUtils.class);
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/XMLConstants.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/XMLConstants.java?rev=426345&r1=426344&r2=426345&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/XMLConstants.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/XMLConstants.java
Thu Jul 27 17:55:02 2006
@@ -25,7 +25,7 @@
public interface XMLConstants
{
public static final String SKIN_NAMESPACE =
- "http://myfaces.apache.org/adf/view/faces/skin";;
+ "http://myfaces.apache.org/trinidad/skin";;
public static final String ICONS_NAME = "icons";
public static final String PROPERTIES_NAME = "properties";
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java?rev=426345&r1=426344&r2=426345&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
Thu Jul 27 17:55:02 2006
@@ -137,9 +137,9 @@
f.init(filterConfig);
}
// after the 'services' filters are initialized, then register
- // the skin extensions found in adf-faces-skins.xml. This
+ // the skin extensions found in trinidad-skins.xml. This
// gives a chance to the 'services' filters to create more base
- // skins that the skins in adf-faces-skins.xml can extend.
+ // skins that the skins in trinidad-skins.xml can extend.
SkinUtils.registerSkinExtensions(_servletContext);
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf.xsd
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf.xsd?rev=426345&r1=426344&r2=426345&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf.xsd
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf.xsd
Thu Jul 27 17:55:02 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<schema elementFormDefault="qualified"
targetNamespace="http://myfaces.apache.org/adf/view/faces/skin";
+<schema elementFormDefault="qualified"
targetNamespace="http://myfaces.apache.org/trinidad/skin";
xmlns="http://www.w3.org/2001/XMLSchema";>
<include schemaLocation="laf/lafConfig.xsd" />
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf/lafConfig.xsd
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf/lafConfig.xsd?rev=426345&r1=426344&r2=426345&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf/lafConfig.xsd
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/ui/laf/xml/schemas/laf/lafConfig.xsd
Thu Jul 27 17:55:02 2006
@@ -16,21 +16,21 @@
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns="http://www.w3.org/2001/XMLSchema";
- xmlns:skin="http://myfaces.apache.org/adf/view/faces/skin";
+ xmlns:skin="http://myfaces.apache.org/trinidad/skin";
xmlns:cabotool="http://bali.us.oracle.com/cabo/tool";
xmlns:html="http://www.w3.org/TR/REC-html40";
- targetNamespace="http://myfaces.apache.org/adf/view/faces/skin";
+ targetNamespace="http://myfaces.apache.org/trinidad/skin";
elementFormDefault="qualified">
<xsd:element name="skins" type="skin:skinsType">
<xsd:annotation>
<xsd:documentation>
<cabotool:summary>
- The root element defined in the adf-faces-skins document.
+ The root element defined in the trinidad-skins document.
</cabotool:summary>
<cabotool:description>
<html:p>
- The root element in the adf-faces-skins configuration file. The
- adf-faces-skins configuration files define all of the properties of
+ The root element in the trinidad-skins configuration file. The
+ trinidad-skins configuration files define all of the properties of
custom skins.
</html:p>
</cabotool:description>
@@ -43,7 +43,7 @@
<cabotool:sampleCode>
<?xml version="1.0" encoding="ISO-8859-1"?> <skins>
<!-- A custom skin --> <skin
- xmlns="http://myfaces.apache.org/adf/view/faces/skin">
<id>
+ xmlns="http://myfaces.apache.org/trinidad/skin"> <id>
custom.desktop </id> <family> custom </family>
<style-sheet-name> custom.xss </style-sheet-name>
</skin> </skins>
@@ -104,7 +104,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- A
custom skin that extends the Simple Desktop Look And
Feel --> <look-and-feel
- xmlns="http://myfaces.apache.org/adf/view/faces/skin";
id="custom.desktop"
+ xmlns="http://myfaces.apache.org/trinidad/skin";
id="custom.desktop"
family="custom" extends="simple.desktop"> <!-- Define
some
custom icons --> <icons> <!-- Replace the error
icon
with a context-relative icon. --> <icon
@@ -145,7 +145,7 @@
<cabotool:sampleCode>
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- A custom skin that extends the Simple Desktop Look And Feel -->
- <look-and-feel xmlns="http://myfaces.apache.org/adf/view/faces/skin";
+ <look-and-feel xmlns="http://myfaces.apache.org/trinidad/skin";
id="custom.desktop" family="custom" extends="simple.desktop">
<!-- Register a custom ResourceBundle -->
<bundle-name>
