You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/09/13 15:50:39 UTC
svn commit: r996531 - in /myfaces/tobago/branches/tobago-1.0.x/core/src/main:
java/org/apache/myfaces/tobago/config/
resources/org/apache/myfaces/tobago/config/
Author: lofwyr
Date: Mon Sep 13 13:50:38 2010
New Revision: 996531
URL: http://svn.apache.org/viewvc?rev=996531&view=rev
Log:
TOBAGO-917: Extend tobago-config.xml: New DTD for 1.0.30
- configure: fix-layout-transparency
Added:
myfaces/tobago/branches/tobago-1.0.x/core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd
- copied, changed from r996435, myfaces/tobago/branches/tobago-1.0.x/core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.29.dtd
Modified:
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java?rev=996531&r1=996530&r2=996531&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java Mon Sep 13 13:50:38 2010
@@ -44,6 +44,7 @@ public class TobagoConfig {
private List<MappingRule> mappingRules;
private boolean ajaxEnabled;
private boolean fixResourceOrder;
+ private boolean fixLayoutTransparency;
private Map<String, Theme> availableTheme;
private RenderersConfig renderersConfig;
@@ -54,6 +55,7 @@ public class TobagoConfig {
resourceDirs = new ArrayList<String>();
ajaxEnabled = true;
fixResourceOrder = false;
+ fixLayoutTransparency = false;
}
public void addMappingRule(MappingRule mappingRule) {
@@ -182,6 +184,14 @@ public class TobagoConfig {
this.fixResourceOrder = Boolean.valueOf(fixResourceOrder);
}
+ public boolean isFixLayoutTransparency() {
+ return fixLayoutTransparency;
+ }
+
+ public void setFixLayoutTransparency(String fixLayoutTransparency) {
+ this.fixLayoutTransparency = Boolean.valueOf(fixLayoutTransparency);
+ }
+
@Deprecated
public void setLoadThemesFromClasspath(String loadThemesFromClasspath) {
Deprecation.LOG.error("Deprecated: setting load-theme-resources-from-classpath is "
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java?rev=996531&r1=996530&r2=996531&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java Mon Sep 13 13:50:38 2010
@@ -42,6 +42,7 @@ public class TobagoConfigParser {
private static final Log LOG = LogFactory.getLog(TobagoConfigParser.class);
private static final String TOBAGO_CONFIG_DTD_1_0 = "/org/apache/myfaces/tobago/config/tobago-config_1_0.dtd";
private static final String TOBAGO_CONFIG_DTD_1_0_29 = "/org/apache/myfaces/tobago/config/tobago-config-1.0.29.dtd";
+ private static final String TOBAGO_CONFIG_DTD_1_0_30 = "/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd";
public TobagoConfig parse(ServletContext context)
throws IOException, SAXException, FacesException {
@@ -90,6 +91,9 @@ public class TobagoConfigParser {
// see bug TOBAGO-912
digester.addCallMethod("tobago-config/fix-resource-order", "setFixResourceOrder", 0);
+ // see bug TOBAGO-916
+ digester.addCallMethod("tobago-config/fix-layout-transparency", "setFixLayoutTransparency", 0);
+
digester.addObjectCreate("tobago-config/renderers", RenderersConfigImpl.class);
digester.addSetNext("tobago-config/renderers", "setRenderersConfig");
digester.addObjectCreate("tobago-config/renderers/renderer", RendererConfig.class);
@@ -126,6 +130,7 @@ public class TobagoConfigParser {
registerDtd(digester, "-//Atanion GmbH//DTD Tobago Config 1.0//EN", TOBAGO_CONFIG_DTD_1_0);
registerDtd(digester, "-//The Apache Software Foundation//DTD Tobago Config 1.0//EN", TOBAGO_CONFIG_DTD_1_0);
registerDtd(digester, "-//The Apache Software Foundation//DTD Tobago Config 1.0.29//EN", TOBAGO_CONFIG_DTD_1_0_29);
+ registerDtd(digester, "-//The Apache Software Foundation//DTD Tobago Config 1.0.30//EN", TOBAGO_CONFIG_DTD_1_0_30);
}
private void registerDtd(Digester digester, String publicId, String entityUrl) {
Copied: myfaces/tobago/branches/tobago-1.0.x/core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd (from r996435, myfaces/tobago/branches/tobago-1.0.x/core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.29.dtd)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd?p2=myfaces/tobago/branches/tobago-1.0.x/core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd&p1=myfaces/tobago/branches/tobago-1.0.x/core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.29.dtd&r1=996435&r2=996531&rev=996531&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.29.dtd (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd Mon Sep 13 13:50:38 2010
@@ -18,17 +18,18 @@
-->
<!--
- This is the DTD for the tobago configuration files version 1.0.29.
+ This is the DTD for the tobago configuration files version 1.0.30.
You should use the following DOCTYPE in your tobago-config.xml:
<!DOCTYPE tobago-config PUBLIC
- "-//The Apache Software Foundation//DTD Tobago Config 1.0.29//EN"
- "http://myfaces.apache.org/tobago/tobago-config-1.0.29.dtd">
+ "-//The Apache Software Foundation//DTD Tobago Config 1.0.30//EN"
+ "http://myfaces.apache.org/tobago/tobago-config-1.0.30.dtd">
-->
<!ENTITY % Boolean "(true|false|yes|no)">
-<!ELEMENT tobago-config (theme-config, resource-dir*, ajax-enabled?, fix-resource-order?, renderers?)>
+<!ELEMENT tobago-config (theme-config, resource-dir*,
+ ajax-enabled?, fix-resource-order?, fix-layout-transparency?, renderers?)>
<!ELEMENT theme-config (default-theme, supported-theme*)>
<!ELEMENT default-theme (#PCDATA)>
@@ -44,6 +45,14 @@
<!ELEMENT fix-resource-order (#PCDATA)>
+<!--
+ UIParameter, UIHiddenInput and UIInstruction (from the <?xml ...> declaration when using facelets)
+ should not be part of the layout.
+ You have to enable this behavior, because of backward compatibility.
+ For Tobago 1.5 this will be the normal behavior and this configuration entry will be removed.
+ -->
+<!ELEMENT fix-layout-transparency (#PCDATA)>
+
<!ELEMENT renderers (renderer)*>
<!ELEMENT renderer (name|supported-markup)*>
<!ELEMENT supported-markup (markup)*>